# HG changeset patch # User diego # Date 1146105207 0 # Node ID 941c00ef6d94600c63d49a8cc319e812d1a3d4a4 # Parent 13460cb4ec737e6312e80085d85fcb62347810b2 Disentangle dependencies between amr_nb and amr_nb-fixed: amr_nb-fixed does work even without amr_nb. diff -r 13460cb4ec73 -r 941c00ef6d94 Makefile --- 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)