[Ffmpeg-cvslog] r5921 - in trunk: common.mak configure

[diego]

Author: diego
Date: Thu Aug  3 18:27:30 2006
New Revision: 5921

Modified:
   trunk/common.mak
   trunk/configure

Log:
Move MinGW special casing for shared lib creation to configure.


Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Thu Aug  3 18:27:30 2006
@@ -22,9 +22,7 @@
 
 $(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 $@ $<

Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Aug  3 18:27:30 2006
@@ -884,6 +884,7 @@
     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 @@
   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