[Ffmpeg-cvslog] CVS: ffmpeg/libavformat Makefile,1.128,1.129

[Diego Biurrun CVS]

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

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


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- Makefile	15 Apr 2006 15:05:53 -0000	1.128
+++ Makefile	6 May 2006 10:57:38 -0000	1.129
@@ -26,17 +26,9 @@
 endif
 
 
-AMROBJS=
-ifeq ($(AMR_NB),yes)
-AMROBJS= amr.o
-endif
-ifeq ($(AMR_NB_FIXED),yes)
-AMROBJS= amr.o
-endif
-ifeq ($(AMR_WB),yes)
-AMROBJS= amr.o
+ifeq ($(AMR),yes)
+OBJS+= amr.o
 endif
-OBJS+= $(AMROBJS)
 
 # image formats
 OBJS+= pnm.o yuv.o png.o jpeg.o gifdec.o sgi.o