[SCM] libav/experimental: 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.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 7981555d89c16850201a0eda2aca6dc5400cf275
Author: Diego Biurrun <diego at biurrun.de>
Date:   Thu Aug 17 16:32:08 2006 +0000

    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.
    
    Originally committed as revision 6016 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 80f2201..89f4c40 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -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 \
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 294c209..eecbcb2 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -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
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 55d1f2b..5b78adc 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -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 \
diff --git a/libpostproc/Makefile b/libpostproc/Makefile
index b6ac1a6..c7bbdc1 100644
--- a/libpostproc/Makefile
+++ b/libpostproc/Makefile
@@ -15,7 +15,7 @@ SHARED_OBJS=postprocess_pic.o
 
 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
diff --git a/vhook/Makefile b/vhook/Makefile
index 1335355..638f15a 100644
--- a/vhook/Makefile
+++ b/vhook/Makefile
@@ -2,8 +2,8 @@ include ../config.mak
 
 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)

-- 
Libav/FFmpeg packaging