summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-04-27 03:31:26 +0000
committerDiego Biurrun <diego@biurrun.de>2006-04-27 03:31:26 +0000
commit3ed410a6bd787eb46d5ba9e05e77167b561686da (patch)
tree41bef77689226abd9c90722cf1764feb3e2575fd
parent06aa32ff18eefd9bcd9755405d7ec72288509d21 (diff)
Fix amr_nb-fixed build.
Originally committed as revision 5324 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/Makefile8
1 files 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