comparison Makefile @ 3292:1fd5fce70e66 libavcodec

Further simplify AMR build.
author diego
date Sat, 06 May 2006 10:57:38 +0000
parents 97cc530ab3d3
children 165069d58cc2
comparison
equal deleted inserted replaced
3291:454de57e45cf 3292:1fd5fce70e66
233 ifeq ($(CONFIG_ZMBV_DECODER),yes) 233 ifeq ($(CONFIG_ZMBV_DECODER),yes)
234 OBJS+= zmbv.o 234 OBJS+= zmbv.o
235 endif 235 endif
236 236
237 237
238 AMROBJS= 238 ifeq ($(AMR),yes)
239 OBJS+= amr.o
240 endif
239 241
240 ifeq ($(AMR_NB),yes) 242 ifeq ($(AMR_NB),yes)
241 AMROBJS= amr.o
242 OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o 243 OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
243 endif 244 endif
244 245
245 ifeq ($(AMR_NB_FIXED),yes) 246 ifeq ($(AMR_NB_FIXED),yes)
246 AMROBJS= amr.o
247 EXTRAOBJS += amr/*.o 247 EXTRAOBJS += amr/*.o
248 EXTRADEPS=amrlibs 248 EXTRADEPS=amrlibs
249 endif 249 endif
250 250
251 ifeq ($(AMR_WB),yes) 251 ifeq ($(AMR_WB),yes)
252 AMROBJS= amr.o
253 OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \ 252 OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
254 amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \ 253 amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
255 amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \ 254 amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
256 amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \ 255 amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
257 amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \ 256 amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
258 amrwb_float/enc_util.o amrwb_float/if_rom.o 257 amrwb_float/enc_util.o amrwb_float/if_rom.o
259 endif 258 endif
260
261 OBJS+= $(AMROBJS)
262 259
263 260
264 ifeq ($(HAVE_PTHREADS),yes) 261 ifeq ($(HAVE_PTHREADS),yes)
265 OBJS+= pthread.o 262 OBJS+= pthread.o
266 endif 263 endif