Mercurial > libavcodec.hg

changeset 3933:ed92e541db41 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify EXTRALIBS handling.
author diego
date Thu, 05 Oct 2006 00:32:56 +0000
parents d13da74a26f5
children f2f03d25e58c
files Makefile
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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