[SCM] libav/experimental: Move MinGW special casing for shared lib creation to configure.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:49:43 UTC 2013


The following commit has been merged in the experimental branch:
commit 5cb854e1c68330f5dd0ca13cabb2a9a58b53b7eb
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Aug 3 16:27:30 2006 +0000

    Move MinGW special casing for shared lib creation to configure.
    
    Originally committed as revision 5921 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/common.mak b/common.mak
index 41cac95..2748e5e 100644
--- a/common.mak
+++ b/common.mak
@@ -22,9 +22,7 @@ $(SLIBNAME): $(SLIBNAME_WITH_MAJOR)
 
 $(SLIBNAME_WITH_MAJOR): $(SHARED_OBJS)
 	$(CC) $(SHFLAGS) $(LDFLAGS) -o $@ $^ $(EXTRALIBS) $(EXTRAOBJS)
-ifeq ($(CONFIG_MINGW),yes)
-	-lib /machine:i386 /def:$(@:.dll=.def)
-endif
+	$(SLIB_EXTRA_CMD)
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
diff --git a/configure b/configure
index d281267..30ce3d5 100755
--- a/configure
+++ b/configure
@@ -884,6 +884,7 @@ EOF
     EXESUF=".exe"
     SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
     SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
+    SLIB_EXTRA_CMD='-lib /machine:i386 /def:$(@:.dll=.def)'
     if test "$force_prefix" != yes; then PREFIX="$PROGRAMFILES/FFmpeg"; fi
     if test "$force_libdir" != yes; then bindir="$PREFIX"; fi
 fi
@@ -1739,6 +1740,7 @@ if test "$lshared" = "yes" ; then
   echo "SLIBNAME=${SLIBNAME}" >> config.mak
   echo "SLIBNAME_WITH_VERSION=${SLIBNAME_WITH_VERSION}" >> config.mak
   echo "SLIBNAME_WITH_MAJOR=${SLIBNAME_WITH_MAJOR}" >> config.mak
+  echo "SLIB_EXTRA_CMD=${SLIB_EXTRA_CMD}" >> config.mak
 fi
 echo "EXTRALIBS=$extralibs" >> config.mak
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list