Move CFLAGS handling to common.mak.

Originally committed as revision 6642 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/common.mak b/common.mak
index 78985d8..21b2273 100644 (file)
--- a/common.mak
+++ b/common.mak
@@ -5,6 +5,9 @@
 SRC_DIR = $(SRC_PATH)/lib$(NAME)
 VPATH = $(SRC_DIR)
 
+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)
 SRCS := $(OBJS:.o=.c) $(ASM_OBJS:.o=.S) $(CPPOBJS:.o=.cpp)
 OBJS := $(OBJS) $(ASM_OBJS) $(CPPOBJS)
 STATIC_OBJS := $(OBJS) $(STATIC_OBJS)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index da5236e..3193e74 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -4,8 +4,7 @@
 #
 include ../config.mak
 
-CFLAGS=-DHAVE_AV_CONFIG_H -I$(BUILD_ROOT) -I$(SRC_PATH)/libavutil $(OPTFLAGS) \
-       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE $(AMR_CFLAGS)
+CFLAGS+=$(AMR_CFLAGS)
 
 OBJS= bitstream.o \
       utils.o \

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 0004889..4cebcf8 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -4,9 +4,7 @@
 #
 include ../config.mak
 
-CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \
-       $(OPTFLAGS) -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
+CFLAGS+=-I$(SRC_PATH)/libavcodec
 
 OBJS= utils.o cutils.o os_support.o allformats.o
 

diff --git a/libavutil/Makefile b/libavutil/Makefile
index b46c627..2427a70 100644 (file)
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -3,8 +3,7 @@
 #
 include ../config.mak
 
-CFLAGS=-DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I$(BUILD_ROOT) $(OPTFLAGS) \
-       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
+CFLAGS+=-DBUILD_AVUTIL
 
 OBJS= mathematics.o \
       rational.o \

diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index f7619c3..6f95049 100644 (file)
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -15,8 +15,6 @@ SHARED_OBJS=postprocess_pic.o
 
 HEADERS = postprocess.h
 
-CFLAGS  = -I$(BUILD_ROOT) -I$(SRC_PATH)/libavutil $(OPTFLAGS)
-
 include $(SRC_PATH)/common.mak
 
 depend: postprocess.c