Mercurial > libavcodec.hg
changeset 3275:13460cb4ec73 libavcodec
cosmetics: Group all AMR variables together, add some newlines.
| author | diego |
|---|---|
| date | Thu, 27 Apr 2006 02:23:42 +0000 |
| parents | 84570ccc4f0c |
| children | 941c00ef6d94 |
| files | Makefile |
| diffstat | 1 files changed, 16 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Thu Apr 27 02:19:42 2006 +0000 +++ b/Makefile Thu Apr 27 02:23:42 2006 +0000 @@ -234,7 +234,9 @@ OBJS+= zmbv.o endif + AMROBJS= + ifeq ($(AMR_NB),yes) ifeq ($(AMR_NB_FIXED),yes) AMROBJS= amr.o @@ -248,6 +250,20 @@ endif 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 \ + amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \ + amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \ + amrwb_float/enc_util.o amrwb_float/if_rom.o +CLEANAMR=cleanamrwbfloat +endif + +OBJS+= $(AMROBJS) + + ifeq ($(HAVE_PTHREADS),yes) OBJS+= pthread.o endif @@ -265,17 +281,6 @@ OBJS+= beosthread.o 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 \ - amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \ - amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \ - amrwb_float/enc_util.o amrwb_float/if_rom.o -CLEANAMR=cleanamrwbfloat -endif -OBJS+= $(AMROBJS) ASM_OBJS= ifeq ($(HAVE_XVMC_ACCEL),yes)