[Ffmpeg-cvslog] r5817 - in trunk: Makefile configure
diego
subversion
Mon Jul 24 02:52:43 CEST 2006
Author: diego
Date: Mon Jul 24 02:52:42 2006
New Revision: 5817
Modified:
trunk/Makefile
trunk/configure
Log:
Rename FFSLDFLAGS variable to FFSERVERLDFLAGS to lessen confusion.
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Jul 24 02:52:42 2006
@@ -72,7 +72,7 @@
$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffmpeg.o cmdutils.o $(FFLIBS) $(EXTRALIBS)
ffserver$(EXESUF): ffserver.o .libs
- $(CC) $(FFLIBDIRS) $(LDFLAGS) $(FFSLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
+ $(CC) $(FFLIBDIRS) $(LDFLAGS) $(FFSERVERLDFLAGS) -o $@ ffserver.o $(FFLIBS) $(EXTRALIBS)
ffplay_g$(EXESUF): ffplay.o cmdutils.o .libs
$(CC) $(FFLIBDIRS) $(LDFLAGS) -o $@ ffplay.o cmdutils.o $(FFLIBS) $(EXTRALIBS) $(SDL_LIBS)
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Mon Jul 24 02:52:42 2006
@@ -444,7 +444,7 @@
ffplay="yes"
LIBOBJFLAGS=""
FFLDFLAGS=-Wl,--warn-common
-FFSLDFLAGS=-Wl,-E
+FFSERVERLDFLAGS=-Wl,-E
LDCONFIG="ldconfig"
LIBPREF="lib"
LIBSUF=".a"
@@ -506,7 +506,7 @@
dv1394="no"
make="gmake"
FFLDFLAGS=""
-FFSLDFLAGS=""
+FFSERVERLDFLAGS=""
SHFLAGS="-shared -Wl,-h,\$@"
need_inet_aton="yes"
extralibs="$extralibs -lsocket -lnsl"
@@ -575,7 +575,7 @@
SLIBSUF=".dylib"
SLIBNAME_WITH_FULLVERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
-FFSLDFLAGS=-Wl,-bind_at_load
+FFSERVERLDFLAGS=-Wl,-bind_at_load
;;
MINGW32*)
# Note: the rest of the mingw32 config is done afterwards as mingw32
@@ -614,7 +614,7 @@
CFLAGS="$CFLAGS -Zomf"
FFLDFLAGS="-Zomf -Zstack 16384 -s"
SHFLAGS="-Zdll -Zomf"
-FFSLDFLAGS=""
+FFSERVERLDFLAGS=""
LIBPREF=""
LIBSUF=".lib"
SLIBPREF=""
@@ -1586,7 +1586,7 @@
echo "SHCFLAGS=$SHCFLAGS">>config.mak
echo "LDFLAGS=$LDFLAGS" >> config.mak
echo "LDCONFIG=$LDCONFIG" >> config.mak
-echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
+echo "FFSERVERLDFLAGS=$FFSERVERLDFLAGS" >> config.mak
echo "SHFLAGS=$SHFLAGS" >> config.mak
echo "VHOOKFLAGS=$VHOOKFLAGS" >> config.mak
echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
More information about the ffmpeg-cvslog
mailing list