# HG changeset patch # User diego # Date 1160008376 0 # Node ID ed92e541db417a72690c8f6f16f87fcbe448866d # Parent d13da74a26f50a72170af0e1a303766e0acd4011 Simplify EXTRALIBS handling. diff -r d13da74a26f5 -r ed92e541db41 Makefile --- a/Makefile Thu Oct 05 00:23:24 2006 +0000 +++ b/Makefile Thu Oct 05 00:32:56 2006 +0000 @@ -400,7 +400,6 @@ ASM_OBJS += $(ASM_OBJS-yes) NAME=avcodec -LIBAVUTIL= $(SRC_PATH)/libavutil/$(LIBPREF)avutil$(LIBSUF) ifeq ($(BUILD_SHARED),yes) LIBVERSION=$(LAVCVERSION) LIBMAJOR=$(LAVCMAJOR) @@ -432,7 +431,7 @@ # api example program apiexample: apiexample.c $(LIB) - $(CC) $(CFLAGS) -o $@ $^ $(LIBAVUTIL) $(EXTRALIBS) + $(CC) $(CFLAGS) -o $@ $^ $(EXTRALIBS) # cpuid test cpuid_test: i386/cputest.c @@ -444,12 +443,12 @@ $(CC) $(CFLAGS) -DTEST -o $@ $^ -lm dct-test: dct-test.o fdctref.o $(LIB) - $(CC) -o $@ $^ -lm $(LIBAVUTIL) + $(CC) -o $@ $^ $(EXTRALIBS) motion-test: motion_test.o $(LIB) $(CC) -o $@ $^ -lm fft-test: fft-test.o $(LIB) - $(CC) -o $@ $^ $(LIBAVUTIL) -lm + $(CC) -o $@ $^ $(EXTRALIBS) .PHONY: amrlibs tests