# HG changeset patch # User diego # Date 1177528324 0 # Node ID 8066ba08988900e7d841e26dc5b184b3124f54e4 # Parent 384c95879d8b1b3b5b62f14148ab118259df9d40 Remove hackish support for the non-free fixed-point AMR-NB reference code. diff -r 384c95879d8b -r 8066ba089889 Makefile --- a/Makefile Tue Apr 24 17:31:39 2007 +0000 +++ b/Makefile Wed Apr 25 19:12:04 2007 +0000 @@ -271,10 +271,6 @@ OBJS-$(CONFIG_XVID) += xvidff.o xvid_rc.o OBJS-$(CONFIG_AMR) += amr.o -ifeq ($(CONFIG_AMR_NB_FIXED),yes) -EXTRAOBJS += amr/*.o -EXTRADEPS=amrlibs -endif OBJS-$(CONFIG_AAC_PARSER) += parser.o @@ -397,9 +393,6 @@ include ../common.mak -amrlibs: - $(MAKE) -C amr spclib fipoplib - tests: apiexample $(TESTS) clean:: @@ -413,7 +406,6 @@ sh4/*.o sh4/*~ \ sparc/*.o sparc/*~ \ apiexample $(TESTS) - -$(MAKE) -C amr clean apiexample: apiexample.o $(LIB) @@ -429,4 +421,4 @@ fft-test: fft-test.o $(LIB) -.PHONY: amrlibs tests +.PHONY: tests