# HG changeset patch # User diego # Date 1146913058 0 # Node ID 1fd5fce70e6657b77397571b1da9da5943dca36e # Parent 454de57e45cfae986f22a5fce13fae3c15d9a817 Further simplify AMR build. diff -r 454de57e45cf -r 1fd5fce70e66 Makefile --- a/Makefile Fri May 05 18:08:01 2006 +0000 +++ b/Makefile Sat May 06 10:57:38 2006 +0000 @@ -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