Am 15.05.2014 17:08 schrieb "Diego Biurrun" <[email protected]>:
>
> The feature is of doubtful utility and has no known users.
> ---
> common.mak | 3 +--
> configure | 38 +++++++++++++++-----------------------
> library.mak | 2 +-
> 3 files changed, 17 insertions(+), 26 deletions(-)
>
> diff --git a/common.mak b/common.mak
> index c17b5bf..ddef219 100644
> --- a/common.mak
> +++ b/common.mak
> @@ -11,8 +11,7 @@ OBJS += $(OBJS-yes)
> FFLIBS := $(FFLIBS-$(if $(NAME),$(NAME),no)) $(FFLIBS-yes) $(FFLIBS)
> TESTPROGS += $(TESTPROGS-yes)
>
> -LDLIBS = $(FFLIBS:%=%$(BUILDSUF))
> -FFEXTRALIBS := $(LDLIBS:%=$(LD_LIB)) $(EXTRALIBS)
> +FFEXTRALIBS := $(FFLIBS:%=$(LD_LIB)) $(EXTRALIBS)
>
> OBJS := $(sort $(OBJS:%=$(SUBDIR)%))
> TESTOBJS := $(TESTOBJS:%=$(SUBDIR)%) $(TESTPROGS:%=$(SUBDIR)%-test.o)
> diff --git a/configure b/configure
> index c27bc75..7ef618e 100755
> --- a/configure
> +++ b/configure
> @@ -248,7 +248,6 @@ Toolchain options:
> --extra-libs=ELIBS add ELIBS [$ELIBS]
> --extra-version=STRING version string suffix []
> --optflags=OPTFLAGS override optimization-related compiler flags
> - --build-suffix=SUFFIX library name suffix []
> --enable-pic build position-independent code
> --enable-thumb compile for Thumb instruction set
> --enable-lto use link-time optimization
> @@ -1590,7 +1589,6 @@ CMDLINE_SET="
> ar
> arch
> as
> - build_suffix
> cc
> cpu
> cross_prefix
> @@ -2199,11 +2197,10 @@ enable dxva2 vdpau
> SHFLAGS='-shared -Wl,-soname,$$(@F)'
> LIBPREF="lib"
> LIBSUF=".a"
> -FULLNAME='$(NAME)$(BUILDSUF)'
> -LIBNAME='$(LIBPREF)$(FULLNAME)$(LIBSUF)'
> +LIBNAME='$(LIBPREF)$(NAME)$(LIBSUF)'
> SLIBPREF="lib"
> SLIBSUF=".so"
> -SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
> +SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
> SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
> SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
> LIB_INSTALL_EXTRA_CMD='$$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
> @@ -3382,8 +3379,8 @@ case $target_os in
> enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
> add_ldflags -Wl,-dynamic,-search_paths_first
> SLIBSUF=".dylib"
> -
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
> -
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
> +
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
> + SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
> objformat="macho"
> enabled x86_64 && objformat="macho64"
> enabled_any pic shared ||
> @@ -3406,8 +3403,8 @@ case $target_os in
> shlibdir_default="$bindir_default"
> SLIBPREF=""
> SLIBSUF=".dll"
> -
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
> -
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
> +
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
> + SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
> SLIB_EXTRA_CMD=-'sed -e "s/ @[^ ]*//" $$(@:$(SLIBSUF)=.orig.def)
> $$(@:$(SLIBSUF)=.def); $(DLLTOOL) -m $(LIBTARGET) -d
$$(@:$(SLIBSUF)=.def) -l $(SUBDIR)$(SLIBNAME:$(SLIBSUF)=.lib) -D
$(SLIBNAME_WITH_MAJOR)'
> SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
> SLIB_INSTALL_LINKS=
> @@ -3431,8 +3428,8 @@ case $target_os in
> shlibdir_default="$bindir_default"
> SLIBPREF=""
> SLIBSUF=".dll"
> -
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
> -
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
> +
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
> + SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
> SLIB_CREATE_DEF_CMD='$(SRC_PATH)/compat/windows/makedef
$(SUBDIR)lib$(NAME).ver $(OBJS) > $$(@:$(SLIBSUF)=.def)'
> SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
> SLIB_INSTALL_LINKS=
> @@ -3448,12 +3445,12 @@ case $target_os in
> shlibdir_default="$bindir_default"
> SLIBPREF="cyg"
> SLIBSUF=".dll"
> -
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
> -
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
> +
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
> + SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
> SLIB_INSTALL_NAME='$(SLIBNAME_WITH_MAJOR)'
> SLIB_INSTALL_LINKS=
> - SLIB_INSTALL_EXTRA_LIB='lib$(FULLNAME).dll.a'
> - SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a'
> + SLIB_INSTALL_EXTRA_LIB='lib$(NAME).dll.a'
> + SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(NAME).dll.a'
> objformat="win32"
> enable dos_paths
> ;;
> @@ -4408,9 +4405,6 @@ if test "$host_cc" != "$cc"; then
> echo "host C library $host_libc_type"
> fi
> echo "ARCH $arch ($cpu)"
> -if test "$build_suffix" != ""; then
> - echo "build suffix $build_suffix"
> -fi
> if test "$extra_version" != ""; then
> echo "version string suffix $extra_version"
> fi
> @@ -4538,8 +4532,6 @@ LDFLAGS=$LDFLAGS
> SHFLAGS=$(echo $($ldflags_filter $SHFLAGS))
> STRIPFLAGS=$STRIPFLAGS
> YASMFLAGS=$YASMFLAGS
> -BUILDSUF=$build_suffix
> -FULLNAME=$FULLNAME
> LIBPREF=$LIBPREF
> LIBSUF=$LIBSUF
> LIBNAME=$LIBNAME
> @@ -4673,13 +4665,13 @@ lib_version(){
>
> pkgconfig_generate(){
> name=$1
> - shortname=${name#lib}${build_suffix}
> + shortname=${name#lib}
> comment=$2
> version=$3
> libs=$4
> - requires=$(map 'lib_version $v' $(eval echo \$${name#lib}_deps))
> + requires=$(map 'lib_version $v' $(eval echo \$${shortname}_deps))
> requires=${requires%, }
> - enabled ${name#lib} || return 0
> + enabled $shortname || return 0
> mkdir -p $name
> cat <<EOF > $name/$name.pc
> prefix=$prefix
> diff --git a/library.mak b/library.mak
> index af33206..51e0982 100644
> --- a/library.mak
> +++ b/library.mak
> @@ -42,7 +42,7 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
> install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
>
> define RULES
> -$(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
> +$(TOOLS): THISLIB = $(NAME:%=$(LD_LIB))
> $(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
>
> $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
> --
> 1.8.3.2
>
> _______________________________________________
> liba
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
