From 5671fc14f67dd20bb9c4a787022987c39498f44f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Thu, 6 Mar 2008 20:44:44 +0000 Subject: consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 4fc2afd..22b2f48 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -4,8 +4,6 @@ # include ../config.mak -CFLAGS += -I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec - OBJS = allcodecs.o \ audioconvert.o \ bitstream.o \ @@ -456,7 +454,7 @@ ASM_OBJS-$(ARCH_BFIN) += bfin/pixels_bfin.o \ bfin/idct_bfin.o \ bfin/vp3_idct_bfin.o \ -EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS) +FFLIBS = avutil NAME=avcodec LIBVERSION=$(LAVCVERSION) -- cgit v1.1