From 5671fc14f67dd20bb9c4a787022987c39498f44f Mon Sep 17 00:00:00 2001 From: Måns Rullgård 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 --- common.mak | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'common.mak') diff --git a/common.mak b/common.mak index ac317d99d9..58f6d7ef69 100644 --- a/common.mak +++ b/common.mak @@ -10,14 +10,20 @@ vpath %.S $(LIBSRC) SRC_DIR = "$(LIBSRC)" +ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale + CFLAGS += $(CFLAGS-yes) OBJS += $(OBJS-yes) ASM_OBJS += $(ASM_OBJS-yes) CPP_OBJS += $(CPP_OBJS-yes) +FFLIBS += $(FFLIBS-yes) CFLAGS += -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE \ -D_ISOC9X_SOURCE -I$(BUILD_ROOT) -I$(SRC_PATH) \ - -I$(SRC_PATH)/libavutil $(OPTFLAGS) + $(addprefix -I$(SRC_PATH)/lib,$(ALLFFLIBS)) $(OPTFLAGS) + +EXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS) +LDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(FFLIBS)) $(LDFLAGS) SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp) OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS) -- cgit v1.2.3