diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-08-17 16:32:08 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-08-17 16:32:08 +0000 |
| commit | 7981555d89c16850201a0eda2aca6dc5400cf275 (patch) | |
| tree | 715b5d1eb149dff860a0c32827afbc345f0b744f | |
| parent | a9f9cc7cc13f838298c392ea2a95294ddc402538 (diff) | |
| download | ffmpeg-7981555d89c16850201a0eda2aca6dc5400cf275.tar.gz | |
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
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 4 | ||||
| -rw-r--r-- | libavutil/Makefile | 2 | ||||
| -rw-r--r-- | libpostproc/Makefile | 2 | ||||
| -rw-r--r-- | vhook/Makefile | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 80f2201c14..89f4c402c2 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 294c209cfe..eecbcb25bf 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 55d1f2b330..5b78adc53b 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 b6ac1a6f91..c7bbdc1434 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 13353551b4..638f15a170 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) |