[Ffmpeg-cvslog] CVS: ffmpeg Makefile, 1.80, 1.81 configure, 1.174, 1.175

[François Revol CVS]

Update of /cvsroot/ffmpeg/ffmpeg
In directory mail:/var2/tmp/cvs-serv26980

Modified Files:
	Makefile configure 
Log Message:
support BUILDSUF patch by <charles dot yates at pandora dot be>


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- Makefile	18 Mar 2005 02:13:13 -0000	1.80
+++ Makefile	8 May 2005 15:04:59 -0000	1.81
@@ -91,7 +91,7 @@
 
 OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
 SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
-FFLIBS = -L./libavformat -lavformat -L./libavcodec -lavcodec
+FFLIBS = -L./libavformat -lavformat$(BUILDSUF) -L./libavcodec -lavcodec$(BUILDSUF)
 
 all: lib $(PROG) $(PROGTEST) $(VHOOK) $(QTFASTSTART) $(DOC)
 

Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- configure	7 May 2005 09:48:38 -0000	1.174
+++ configure	8 May 2005 15:04:59 -0000	1.175
@@ -47,6 +47,7 @@
 echo "  --extra-cflags=ECFLAGS   add ECFLAGS to CFLAGS [$CFLAGS]"
 echo "  --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]"
 echo "  --extra-libs=ELIBS       add ELIBS [$ELIBS]"
+echo "  --build-suffix=SUFFIX    suffix for application specific build []"
 echo "  --cpu=CPU                force cpu to CPU  [$cpu]"
 echo "  --tune=PROCESSOR         tune code for a particular CPU (may fails or misperforms on other CPUs)"
 echo "  --powerpc-perf-enable    enable performance report on PPC (requires enabling PMC)"
@@ -198,6 +199,7 @@
 SLIBPREF="lib"
 SLIBSUF=".so"
 EXESUF=""
+BUILDSUF=""
 amr_nb="no"
 amr_wb="no"
 amr_nb_fixed="no"
@@ -403,6 +405,8 @@
   ;;
   --extra-libs=*) extralibs=${opt#--extra-libs=}
   ;;
+  --build-suffix=*) BUILDSUF=${opt#--build-suffix=}
+  ;;
   --cpu=*) cpu=`echo $opt | cut -d '=' -f 2`
   ;;
   --tune=*) tune=`echo $opt | cut -d '=' -f 2`
@@ -1092,6 +1096,9 @@
 echo "C compiler       $cc"
 echo "make             $make"
 echo "CPU              $cpu ($tune)"
+if test "$BUILDSUF" != ""; then
+echo "Build suffix     $BUILDSUF"
+fi
 echo "Big Endian       $bigendian"
 echo "inttypes.h       $inttypes"
 echo "broken inttypes.h $emu_fast_int"
@@ -1186,11 +1193,12 @@
 echo "LDFLAGS=$LDFLAGS" >> config.mak
 echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak
+echo "BUILDSUF=$BUILDSUF" >> config.mak
 echo "LIBPREF=$LIBPREF" >> config.mak
-echo "LIBSUF=$LIBSUF" >> config.mak
+echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak
 echo "SLIBPREF=$SLIBPREF" >> config.mak
-echo "SLIBSUF=$SLIBSUF" >> config.mak
-echo "EXESUF=$EXESUF" >> config.mak
+echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak
+echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak
 echo "TARGET_OS=$TARGET_OS" >> config.mak
 if test "$cpu" = "x86" ; then
   echo "TARGET_ARCH_X86=yes" >> config.mak