[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec Makefile,1.259,1.260

[Diego Biurrun CVS]

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

Modified Files:
	Makefile 
Log Message:
Further simplify AMR build.


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -r1.259 -r1.260
--- Makefile	5 May 2006 10:27:44 -0000	1.259
+++ Makefile	6 May 2006 10:57:38 -0000	1.260
@@ -235,21 +235,20 @@
 endif
 
 
-AMROBJS=
+ifeq ($(AMR),yes)
+OBJS+= amr.o
+endif
 
 ifeq ($(AMR_NB),yes)
-AMROBJS= amr.o
 OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
 endif
 
 ifeq ($(AMR_NB_FIXED),yes)
-AMROBJS= amr.o
 EXTRAOBJS += amr/*.o
 EXTRADEPS=amrlibs
 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 \
@@ -258,8 +257,6 @@
        amrwb_float/enc_util.o  amrwb_float/if_rom.o
 endif
 
-OBJS+= $(AMROBJS)
-
 
 ifeq ($(HAVE_PTHREADS),yes)
 OBJS+= pthread.o