comparison Makefile @ 3277:cea09585a203 libavcodec

Fix amr_nb-fixed build.
author diego
date Thu, 27 Apr 2006 03:31:26 +0000
parents 941c00ef6d94
children d3371df2542b
comparison
equal deleted inserted replaced
3276:941c00ef6d94 3277:cea09585a203
243 CLEANAMR=cleanamrfloat 243 CLEANAMR=cleanamrfloat
244 endif 244 endif
245 245
246 ifeq ($(AMR_NB_FIXED),yes) 246 ifeq ($(AMR_NB_FIXED),yes)
247 AMROBJS= amr.o 247 AMROBJS= amr.o
248 AMREXTRALIBS+= amr/*.o 248 EXTRAOBJS += amr/*.o
249 AMRLIBS=amrlibs 249 EXTRADEPS=amrlibs
250 CLEANAMR=cleanamr 250 CLEANAMR=cleanamr
251 endif 251 endif
252 252
253 ifeq ($(AMR_WB),yes) 253 ifeq ($(AMR_WB),yes)
254 AMROBJS= amr.o 254 AMROBJS= amr.o
421 LIBVERSION=$(LAVCVERSION) 421 LIBVERSION=$(LAVCVERSION)
422 LIBMAJOR=$(LAVCMAJOR) 422 LIBMAJOR=$(LAVCMAJOR)
423 endif 423 endif
424 TESTS= imgresample-test dct-test motion-test fft-test 424 TESTS= imgresample-test dct-test motion-test fft-test
425 425
426 EXTRAOBJS = $(AMREXTRALIBS)
427
428 include $(SRC_PATH)/common.mak 426 include $(SRC_PATH)/common.mak
429
430 $(LIB): $(AMRLIBS)
431 427
432 amrlibs: 428 amrlibs:
433 $(MAKE) -C amr spclib fipoplib 429 $(MAKE) -C amr spclib fipoplib
434 430
435 tests: apiexample cpuid_test $(TESTS) 431 tests: apiexample cpuid_test $(TESTS)