mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-11 05:04:15 +00:00
Append BUILDSUF directly to NAME instead of prepending it to (S)LIBSUF.
Makes non-posix systems shared library names more correct, such as avcodec-buildsuf-51.dll instead of avcodec-51-buildsuf.dll Originally committed as revision 10813 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
4f9c008cd5
commit
c5f1446678
26
configure
vendored
26
configure
vendored
@ -894,10 +894,11 @@ FFSERVERLDFLAGS=-Wl,-E
|
||||
LDCONFIG="ldconfig"
|
||||
LIBPREF="lib"
|
||||
LIBSUF=".a"
|
||||
LIBNAME='$(LIBPREF)$(NAME)$(LIBSUF)'
|
||||
FULLNAME='$(NAME)$(BUILDSUF)'
|
||||
LIBNAME='$(LIBPREF)$(FULLNAME)$(LIBSUF)'
|
||||
SLIBPREF="lib"
|
||||
SLIBSUF=".so"
|
||||
SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
|
||||
SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
|
||||
LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIBNAME)"'
|
||||
@ -1143,7 +1144,7 @@ case $targetos in
|
||||
LIBOBJFLAGS='$(PIC)'
|
||||
LDCONFIG='ldconfig -m $(SHLIBDIR)'
|
||||
SHFLAGS='-shared'
|
||||
SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF).$(LIBVERSION)'
|
||||
SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF).$(LIBVERSION)'
|
||||
SLIBNAME_WITH_VERSION='$(SLIBNAME)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBNAME)'
|
||||
oss_demuxer_extralibs="-lossaudio"
|
||||
@ -1163,8 +1164,8 @@ case $targetos in
|
||||
strip="strip -x"
|
||||
FFLDFLAGS="-Wl,-dynamic,-search_paths_first"
|
||||
SLIBSUF=".dylib"
|
||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
|
||||
FFSERVERLDFLAGS=-Wl,-bind_at_load
|
||||
;;
|
||||
mingw32*)
|
||||
@ -1180,8 +1181,8 @@ case $targetos in
|
||||
SLIBPREF=""
|
||||
SLIBSUF=".dll"
|
||||
EXESUF=".exe"
|
||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
|
||||
SLIB_EXTRA_CMD='-lib /machine:i386 /def:$(@:$(SLIBSUF)=.def)'
|
||||
SLIB_INSTALL_EXTRA_CMD='-install -m 644 $(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"'
|
||||
SLIB_UNINSTALL_EXTRA_CMD='rm -f "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)"'
|
||||
@ -1199,8 +1200,8 @@ case $targetos in
|
||||
EXESUF=".exe"
|
||||
SLIBPREF="cyg"
|
||||
SLIBSUF=".dll"
|
||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
|
||||
SHFLAGS='-shared -Wl,--enable-auto-image-base'
|
||||
;;
|
||||
linux)
|
||||
@ -1861,12 +1862,13 @@ echo "VHOOKLIBS=$VHOOKLIBS" >> config.mak
|
||||
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
|
||||
echo "BUILD_STATIC=$static" >> config.mak
|
||||
echo "BUILDSUF=$BUILDSUF" >> config.mak
|
||||
echo "FULLNAME=$FULLNAME" >> config.mak
|
||||
echo "LIBPREF=$LIBPREF" >> config.mak
|
||||
echo "LIBSUF=\$(BUILDSUF)$LIBSUF" >> config.mak
|
||||
echo "LIBSUF=$LIBSUF" >> config.mak
|
||||
echo "LIBNAME=$LIBNAME" >> config.mak
|
||||
echo "SLIBPREF=$SLIBPREF" >> config.mak
|
||||
echo "SLIBSUF=\$(BUILDSUF)$SLIBSUF" >> config.mak
|
||||
echo "EXESUF=\$(BUILDSUF)$EXESUF" >> config.mak
|
||||
echo "SLIBSUF=$SLIBSUF" >> config.mak
|
||||
echo "EXESUF=$EXESUF" >> config.mak
|
||||
|
||||
if enabled bigendian; then
|
||||
echo "WORDS_BIGENDIAN=yes" >> config.mak
|
||||
|
Loading…
Reference in New Issue
Block a user