[Ffmpeg-cvslog] r6642 - in trunk: common.mak libavcodec/Makefile libavformat/Makefile libavutil/Makefile libpostproc/Makefile

[diego]

Author: diego
Date: Wed Oct 11 10:30:13 2006
New Revision: 6642

Modified:
   trunk/common.mak
   trunk/libavcodec/Makefile
   trunk/libavformat/Makefile
   trunk/libavutil/Makefile
   trunk/libpostproc/Makefile

Log:
Mov CFLAGS handling to common.mak.


Modified: trunk/common.mak
==============================================================================
--- trunk/common.mak	(original)
+++ trunk/common.mak	Wed Oct 11 10:30:13 2006
@@ -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)

Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Wed Oct 11 10:30:13 2006
@@ -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 \

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Wed Oct 11 10:30:13 2006
@@ -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
 

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	(original)
+++ trunk/libavutil/Makefile	Wed Oct 11 10:30:13 2006
@@ -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 \

Modified: trunk/libpostproc/Makefile
==============================================================================
--- trunk/libpostproc/Makefile	(original)
+++ trunk/libpostproc/Makefile	Wed Oct 11 10:30:13 2006
@@ -15,8 +15,6 @@
 
 HEADERS = postprocess.h
 
-CFLAGS  = -I$(BUILD_ROOT) -I$(SRC_PATH)/libavutil $(OPTFLAGS)
-
 include $(SRC_PATH)/common.mak
 
 depend: postprocess.c