Mercurial > libavcodec.hg

comparison Makefile @ 3275:13460cb4ec73 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: Group all AMR variables together, add some newlines.
author diego
date Thu, 27 Apr 2006 02:23:42 +0000
parents 84570ccc4f0c
children 941c00ef6d94
comparison
equal deleted inserted replaced
3274:84570ccc4f0c 3275:13460cb4ec73
232 endif 232 endif
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 AMROBJS= 238 AMROBJS=
239
238 ifeq ($(AMR_NB),yes) 240 ifeq ($(AMR_NB),yes)
239 ifeq ($(AMR_NB_FIXED),yes) 241 ifeq ($(AMR_NB_FIXED),yes)
240 AMROBJS= amr.o 242 AMROBJS= amr.o
241 AMREXTRALIBS+= amr/*.o 243 AMREXTRALIBS+= amr/*.o
242 AMRLIBS=amrlibs 244 AMRLIBS=amrlibs
246 OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o 248 OBJS+= amr_float/sp_dec.o amr_float/sp_enc.o amr_float/interf_dec.o amr_float/interf_enc.o
247 CLEANAMR=cleanamrfloat 249 CLEANAMR=cleanamrfloat
248 endif 250 endif
249 endif 251 endif
250 252
253 ifeq ($(AMR_WB),yes)
254 AMROBJS= amr.o
255 OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
256 amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
257 amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
258 amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
259 amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
260 amrwb_float/enc_util.o amrwb_float/if_rom.o
261 CLEANAMR=cleanamrwbfloat
262 endif
263
264 OBJS+= $(AMROBJS)
265
266
251 ifeq ($(HAVE_PTHREADS),yes) 267 ifeq ($(HAVE_PTHREADS),yes)
252 OBJS+= pthread.o 268 OBJS+= pthread.o
253 endif 269 endif
254 270
255 ifeq ($(HAVE_W32THREADS),yes) 271 ifeq ($(HAVE_W32THREADS),yes)
263 279
264 ifeq ($(HAVE_BEOSTHREADS),yes) 280 ifeq ($(HAVE_BEOSTHREADS),yes)
265 OBJS+= beosthread.o 281 OBJS+= beosthread.o
266 endif 282 endif
267 283
268 ifeq ($(AMR_WB),yes)
269 AMROBJS= amr.o
270 OBJS+= amrwb_float/dec_acelp.o amrwb_float/dec_dtx.o amrwb_float/dec_gain.o \
271 amrwb_float/dec_if.o amrwb_float/dec_lpc.o amrwb_float/dec_main.o \
272 amrwb_float/dec_rom.o amrwb_float/dec_util.o amrwb_float/enc_acelp.o \
273 amrwb_float/enc_dtx.o amrwb_float/enc_gain.o amrwb_float/enc_if.o \
274 amrwb_float/enc_lpc.o amrwb_float/enc_main.o amrwb_float/enc_rom.o \
275 amrwb_float/enc_util.o amrwb_float/if_rom.o
276 CLEANAMR=cleanamrwbfloat
277 endif
278 OBJS+= $(AMROBJS)
279 ASM_OBJS= 284 ASM_OBJS=
280 285
281 ifeq ($(HAVE_XVMC_ACCEL),yes) 286 ifeq ($(HAVE_XVMC_ACCEL),yes)
282 OBJS+= xvmcvideo.o 287 OBJS+= xvmcvideo.o
283 endif 288 endif