From 3ed410a6bd787eb46d5ba9e05e77167b561686da Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 27 Apr 2006 03:31:26 +0000 Subject: [PATCH] Fix amr_nb-fixed build. Originally committed as revision 5324 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/Makefile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6274f587ea..e6a4e21f4a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -245,8 +245,8 @@ endif ifeq ($(AMR_NB_FIXED),yes) AMROBJS= amr.o -AMREXTRALIBS+= amr/*.o -AMRLIBS=amrlibs +EXTRAOBJS += amr/*.o +EXTRADEPS=amrlibs CLEANAMR=cleanamr endif @@ -423,12 +423,8 @@ LIBMAJOR=$(LAVCMAJOR) endif TESTS= imgresample-test dct-test motion-test fft-test -EXTRAOBJS = $(AMREXTRALIBS) - include $(SRC_PATH)/common.mak -$(LIB): $(AMRLIBS) - amrlibs: $(MAKE) -C amr spclib fipoplib