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
19 years ago · 7981555d89
parent a9f9cc7cc1
commit 7981555d89
5 changed files with 7 additions and 7 deletions
--- 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 \
--- 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
--- 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 \
--- 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
--- 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)