changeset 3276:941c00ef6d94 libavcodec

Disentangle dependencies between amr_nb and amr_nb-fixed: amr_nb-fixed does work even without amr_nb.
author diego
date Thu, 27 Apr 2006 02:33:27 +0000
parents 13460cb4ec73
children cea09585a203
files Makefile
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Apr 27 02:23:42 2006 +0000
+++ b/Makefile	Thu Apr 27 02:33:27 2006 +0000
@@ -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)