[Ffmpeg-cvslog] r7699 - in trunk: common.mak libavcodec/Makefile libavformat/Makefile
diego
subversion
Thu Jan 25 01:34:39 CET 2007
Author: diego
Date: Thu Jan 25 01:34:38 2007
New Revision: 7699
Modified:
trunk/common.mak
trunk/libavcodec/Makefile
trunk/libavformat/Makefile
Log:
Move conditional CFLAGS and OBJS setting to common place.
Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak (original)
+++ trunk/common.mak Thu Jan 25 01:34:38 2007
@@ -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)
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile (original)
+++ trunk/libavcodec/Makefile Thu Jan 25 01:34:38 2007
@@ -400,10 +400,6 @@
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
Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile (original)
+++ trunk/libavformat/Makefile Thu Jan 25 01:34:38 2007
@@ -173,8 +173,6 @@
#OBJS-$(CONFIG_NUT_MUXER) += nutenc.o riff.o
endif
-OBJS += $(OBJS-yes)
-
NAME=avformat
ifeq ($(BUILD_SHARED),yes)
LIBVERSION=$(LAVFVERSION)
More information about the ffmpeg-cvslog
mailing list