From dadb850a50f75cc9149e394878c2341e73f58770 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 11 Oct 2006 08:30:13 +0000
Subject: [PATCH] Move CFLAGS handling to common.mak.
Originally committed as revision 6642 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
common.mak | 3 +++
libavcodec/Makefile | 3 +--
libavformat/Makefile | 4 +---
libavutil/Makefile | 3 +--
libpostproc/Makefile | 2 --
5 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/common.mak b/common.mak
index 78985d8b367..21b2273da4f 100644
--- 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 da5236ea995..3193e749d07 100644
--- 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 00048892ee9..4cebcf865df 100644
--- 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 b46c6271c07..2427a705cd4 100644
--- 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 f7619c31feb..6f95049a3bb 100644
--- 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
--
GitLab