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

[Diego Biurrun CVS]

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

Modified Files:
	Makefile 
Log Message:
Disentangle dependencies between amr_nb and amr_nb-fixed: amr_nb-fixed does
work even without amr_nb.


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- Makefile	27 Apr 2006 02:23:42 -0000	1.255
+++ Makefile	27 Apr 2006 02:33:27 -0000	1.256
@@ -238,16 +238,16 @@
 AMROBJS=
 
 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
+CLEANAMR=cleanamrfloat
+endif
+
 ifeq ($(AMR_NB_FIXED),yes)
 AMROBJS= amr.o
 AMREXTRALIBS+= amr/*.o
 AMRLIBS=amrlibs
 CLEANAMR=cleanamr
-else
-AMROBJS= amr.o
-OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
-CLEANAMR=cleanamrfloat
-endif
 endif
 
 ifeq ($(AMR_WB),yes)