Move conditional CFLAGS and OBJS setting to common place.
authorDiego Biurrun <diego@biurrun.de>
Thu, 25 Jan 2007 00:34:38 +0000 (00:34 +0000)
committerDiego Biurrun <diego@biurrun.de>
Thu, 25 Jan 2007 00:34:38 +0000 (00:34 +0000)
Originally committed as revision 7699 to svn://svn.ffmpeg.org/ffmpeg/trunk

common.mak
libavcodec/Makefile
libavformat/Makefile

index 9f28b596d33457aed440a1ce56e66f3a25d0bd85..0d5fdceec456aa8599bb3c6665dd33fae74443c9 100644 (file)
@@ -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)
index a8fd2c8e1243eee1b62c8a26569adfa9ade344c5..adfc04d459197e99ff3c31123d98895b14d6e4c3 100644 (file)
@@ -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
index 056282c8fe926c42aca6d9afdd63fc30837a0fe0..3f338c7647980de9992d991b22c3580780b2665f 100644 (file)
@@ -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)