diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-01-25 00:34:38 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-01-25 00:34:38 +0000 |
| commit | 722dabcc947592be5473ec6089c5c70488260f63 (patch) | |
| tree | 3394adf57dac9d6b2bef447b49243fcbfab3e828 | |
| parent | 150d27725b8fc9240a8b9d51ae8606782494e2be (diff) | |
| download | ffmpeg-722dabcc947592be5473ec6089c5c70488260f63.tar.gz | |
Move conditional CFLAGS and OBJS setting to common place.
Originally committed as revision 7699 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | common.mak | 4 | ||||
| -rw-r--r-- | libavcodec/Makefile | 4 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/common.mak b/common.mak index 9f28b596d3..0d5fdceec4 100644 --- a/common.mak +++ b/common.mak @@ -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) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a8fd2c8e12..adfc04d459 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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 diff --git a/libavformat/Makefile b/libavformat/Makefile index 056282c8fe..3f338c7647 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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) |