[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec Makefile,1.254,1.255

[Diego Biurrun CVS]

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

Modified Files:
	Makefile 
Log Message:
cosmetics: Group all AMR variables together, add some newlines.


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -d -r1.254 -r1.255
--- Makefile	27 Apr 2006 02:19:42 -0000	1.254
+++ Makefile	27 Apr 2006 02:23:42 -0000	1.255
@@ -234,7 +234,9 @@
 	OBJS+= zmbv.o
 endif
 
+
 AMROBJS=
+
 ifeq ($(AMR_NB),yes)
 ifeq ($(AMR_NB_FIXED),yes)
 AMROBJS= amr.o
@@ -248,6 +250,20 @@
 endif
 endif
 
+ifeq ($(AMR_WB),yes)
+AMROBJS= amr.o
+OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o  amrwb_float/dec_gain.o  \
+       amrwb_float/dec_if.o    amrwb_float/dec_lpc.o  amrwb_float/dec_main.o  \
+       amrwb_float/dec_rom.o   amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
+       amrwb_float/enc_dtx.o   amrwb_float/enc_gain.o amrwb_float/enc_if.o    \
+       amrwb_float/enc_lpc.o   amrwb_float/enc_main.o amrwb_float/enc_rom.o   \
+       amrwb_float/enc_util.o  amrwb_float/if_rom.o
+CLEANAMR=cleanamrwbfloat
+endif
+
+OBJS+= $(AMROBJS)
+
+
 ifeq ($(HAVE_PTHREADS),yes)
 OBJS+= pthread.o
 endif
@@ -265,17 +281,6 @@
 OBJS+= beosthread.o
 endif
 
-ifeq ($(AMR_WB),yes)
-AMROBJS= amr.o
-OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
-		amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
-		amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
-		amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
-		amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
-		amrwb_float/enc_util.o amrwb_float/if_rom.o
-CLEANAMR=cleanamrwbfloat
-endif
-OBJS+= $(AMROBJS)
 ASM_OBJS=
 
 ifeq ($(HAVE_XVMC_ACCEL),yes)