diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-05-06 10:57:38 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-05-06 10:57:38 +0000 |
| commit | 60827a1a802f0608852b1bd2184fc7d4bcd71cd4 (patch) | |
| tree | 4a5d26cba910508932d9b21a0ca0bf38e845f1c9 /libavcodec | |
| parent | 46fe31a019364fbc0b15b78fb0dc5f5d253cf688 (diff) | |
Further simplify AMR build.
Originally committed as revision 5347 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9586361a00..aba23b35a2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -235,21 +235,20 @@ ifeq ($(CONFIG_ZMBV_DECODER),yes) 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 @@ OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \ amrwb_float/enc_util.o amrwb_float/if_rom.o endif -OBJS+= $(AMROBJS) - ifeq ($(HAVE_PTHREADS),yes) OBJS+= pthread.o |