Commit 722dabcc authored by Diego Biurrun's avatar Diego Biurrun
Browse files

Move conditional CFLAGS and OBJS setting to common place.

Originally committed as revision 7699 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 150d2772
......@@ -5,6 +5,10 @@
VPATH = $(SRC_PATH_BARE)/lib$(NAME)
SRC_DIR = "$(VPATH)"
CFLAGS += $(CFLAGS-yes)
OBJS += $(OBJS-yes)
ASM_OBJS += $(ASM_OBJS-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)
......
......@@ -400,10 +400,6 @@ endif
OBJS-$(TARGET_ARCH_BFIN) += bfin/dsputil_bfin.o \
CFLAGS += $(CFLAGS-yes)
OBJS += $(OBJS-yes)
ASM_OBJS += $(ASM_OBJS-yes)
EXTRALIBS := -L$(BUILD_ROOT)/libavutil -lavutil$(BUILDSUF) $(EXTRALIBS)
NAME=avcodec
......
......@@ -173,8 +173,6 @@ OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o riff.o
#OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o
endif
OBJS += $(OBJS-yes)
NAME=avformat
ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVFVERSION)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment