Commit 6dee5479 authored by diego's avatar diego

Fix amr_nb-fixed build.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@5324 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 0f5331c6
...@@ -245,8 +245,8 @@ endif ...@@ -245,8 +245,8 @@ endif
ifeq ($(AMR_NB_FIXED),yes) ifeq ($(AMR_NB_FIXED),yes)
AMROBJS= amr.o AMROBJS= amr.o
AMREXTRALIBS+= amr/*.o EXTRAOBJS += amr/*.o
AMRLIBS=amrlibs EXTRADEPS=amrlibs
CLEANAMR=cleanamr CLEANAMR=cleanamr
endif endif
...@@ -423,12 +423,8 @@ LIBMAJOR=$(LAVCMAJOR) ...@@ -423,12 +423,8 @@ LIBMAJOR=$(LAVCMAJOR)
endif endif
TESTS= imgresample-test dct-test motion-test fft-test TESTS= imgresample-test dct-test motion-test fft-test
EXTRAOBJS = $(AMREXTRALIBS)
include $(SRC_PATH)/common.mak include $(SRC_PATH)/common.mak
$(LIB): $(AMRLIBS)
amrlibs: amrlibs:
$(MAKE) -C amr spclib fipoplib $(MAKE) -C amr spclib fipoplib
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment