diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-07-24 00:52:42 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-07-24 00:52:42 +0000 |
| commit | c536cb09f9c6f2d23b98997656c67df09e6b7a79 (patch) | |
| tree | 4a3a90653d2de7c83652d621b23328e1cda118d1 | |
| parent | d8cfa5534a42f4713b4dedcdaf38f9992fce1943 (diff) | |
| download | ffmpeg-c536cb09f9c6f2d23b98997656c67df09e6b7a79.tar.gz | |
Rename FFSLDFLAGS variable to FFSERVERLDFLAGS to lessen confusion.
Originally committed as revision 5817 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | configure | 10 |
2 files changed, 6 insertions, 6 deletions
@@ -72,7 +72,7 @@ ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs $(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) @@ -444,7 +444,7 @@ ffserver="yes" ffplay="yes" LIBOBJFLAGS="" FFLDFLAGS=-Wl,--warn-common -FFSLDFLAGS=-Wl,-E +FFSERVERLDFLAGS=-Wl,-E LDCONFIG="ldconfig" LIBPREF="lib" LIBSUF=".a" @@ -506,7 +506,7 @@ audio_oss="no" dv1394="no" make="gmake" FFLDFLAGS="" -FFSLDFLAGS="" +FFSERVERLDFLAGS="" SHFLAGS="-shared -Wl,-h,\$@" need_inet_aton="yes" extralibs="$extralibs -lsocket -lnsl" @@ -575,7 +575,7 @@ FFLDFLAGS="-Wl,-dynamic,-search_paths_first" 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 @@ strip="echo ignoring strip" CFLAGS="$CFLAGS -Zomf" FFLDFLAGS="-Zomf -Zstack 16384 -s" SHFLAGS="-Zdll -Zomf" -FFSLDFLAGS="" +FFSERVERLDFLAGS="" LIBPREF="" LIBSUF=".lib" SLIBPREF="" @@ -1586,7 +1586,7 @@ echo "OPTFLAGS=$CFLAGS" >> config.mak 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 |