Mercurial > libavcodec.hg
changeset 3292:1fd5fce70e66 libavcodec
Further simplify AMR build.
author | diego |
---|---|
date | Sat, 06 May 2006 10:57:38 +0000 |
parents | 454de57e45cf |
children | f1bcb9ae510b |
files | Makefile |
diffstat | 1 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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