[Ffmpeg-cvslog] r6016 - in trunk: libavcodec/Makefile libavformat/Makefile libavutil/Makefile libpostproc/Makefile vhook/Makefile

[diego]

Author: diego
Date: Thu Aug 17 18:32:08 2006
New Revision: 6016

Modified:
   trunk/libavcodec/Makefile
   trunk/libavformat/Makefile
   trunk/libavutil/Makefile
   trunk/libpostproc/Makefile
   trunk/vhook/Makefile

Log:
Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.


Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Thu Aug 17 18:32:08 2006
@@ -5,7 +5,7 @@
 include ../config.mak
 
 # NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil \
+CFLAGS=-DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil $(OPTFLAGS) \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE $(AMR_CFLAGS)
 
 OBJS= bitstream.o utils.o allcodecs.o \

Modified: trunk/libavformat/Makefile
==============================================================================
--- trunk/libavformat/Makefile	(original)
+++ trunk/libavformat/Makefile	Thu Aug 17 18:32:08 2006
@@ -4,8 +4,8 @@
 #
 include ../config.mak
 
-CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
-       -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 \
+CFLAGS=-I.. -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
 
 OBJS= utils.o cutils.o os_support.o allformats.o

Modified: trunk/libavutil/Makefile
==============================================================================
--- trunk/libavutil/Makefile	(original)
+++ trunk/libavutil/Makefile	Thu Aug 17 18:32:08 2006
@@ -4,7 +4,7 @@
 include ../config.mak
 
 # NOTE: -I.. is needed to include config.h
-CFLAGS=$(OPTFLAGS) -DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I.. \
+CFLAGS=-DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I.. $(OPTFLAGS) \
        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE
 
 OBJS= mathematics.o \

Modified: trunk/libpostproc/Makefile
==============================================================================
--- trunk/libpostproc/Makefile	(original)
+++ trunk/libpostproc/Makefile	Thu Aug 17 18:32:08 2006
@@ -15,7 +15,7 @@
 
 HEADERS = postprocess.h
 
-CFLAGS  = $(OPTFLAGS) -I.. -I$(SRC_PATH)/libavcodec
+CFLAGS  = -I.. -I$(SRC_PATH)/libavcodec $(OPTFLAGS)
 # -I/usr/X11R6/include/
 
 include $(SRC_PATH)/common.mak

Modified: trunk/vhook/Makefile
==============================================================================
--- trunk/vhook/Makefile	(original)
+++ trunk/vhook/Makefile	Thu Aug 17 18:32:08 2006
@@ -2,8 +2,8 @@
 
 VPATH=$(SRC_PATH)/vhook
 
-CFLAGS=$(VHOOKCFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavformat \
-       -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavutil -DHAVE_AV_CONFIG_H
+CFLAGS=-I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \
+       -I$(SRC_PATH)/libavformat $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H
 
 HOOKS=null$(SLIBSUF) fish$(SLIBSUF) ppm$(SLIBSUF) watermark$(SLIBSUF)
 ALLHOOKS=$(HOOKS) imlib2$(SLIBSUF) drawtext$(SLIBSUF)