diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-10-07 09:22:44 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-10-07 09:22:44 +0000 |
| commit | cbeee4d8e5be247ab8eea3eeda95b08d208b2908 (patch) | |
| tree | f8e4d80eb511de11e43ddf4158108deb7d49236d | |
| parent | 4aad0d6db62813c8f83a90fd3f9cac8196052cfd (diff) | |
| download | ffmpeg-cbeee4d8e5be247ab8eea3eeda95b08d208b2908.tar.gz | |
Replace -I../-I. by -I$(BUILD_ROOT).
Originally committed as revision 6572 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 3 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libavutil/Makefile | 3 | ||||
| -rw-r--r-- | libpostproc/Makefile | 2 | ||||
| -rw-r--r-- | vhook/Makefile | 2 |
6 files changed, 6 insertions, 8 deletions
@@ -6,7 +6,7 @@ include config.mak VPATH=$(SRC_PATH) -CFLAGS=$(OPTFLAGS) -I. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \ +CFLAGS=$(OPTFLAGS) -I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \ -I$(SRC_PATH)/libavcodec -I$(SRC_PATH)/libavformat \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE LDFLAGS+= -g diff --git a/libavcodec/Makefile b/libavcodec/Makefile index e091dba8d0..ac1c88bd29 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -4,8 +4,7 @@ # include ../config.mak -# NOTE: -I.. is needed to include config.h -CFLAGS=-DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavutil $(OPTFLAGS) \ +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) OBJS= bitstream.o \ diff --git a/libavformat/Makefile b/libavformat/Makefile index a9a4632e0a..00048892ee 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -4,7 +4,7 @@ # include ../config.mak -CFLAGS=-I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \ +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 diff --git a/libavutil/Makefile b/libavutil/Makefile index 045041465f..b46c6271c0 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -3,8 +3,7 @@ # include ../config.mak -# NOTE: -I.. is needed to include config.h -CFLAGS=-DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I.. $(OPTFLAGS) \ +CFLAGS=-DHAVE_AV_CONFIG_H -DBUILD_AVUTIL -I$(BUILD_ROOT) $(OPTFLAGS) \ -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_ISOC9X_SOURCE OBJS= mathematics.o \ diff --git a/libpostproc/Makefile b/libpostproc/Makefile index 7a10860c4e..f7619c31fe 100644 --- a/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -15,7 +15,7 @@ SHARED_OBJS=postprocess_pic.o HEADERS = postprocess.h -CFLAGS = -I.. -I$(SRC_PATH)/libavutil $(OPTFLAGS) +CFLAGS = -I$(BUILD_ROOT) -I$(SRC_PATH)/libavutil $(OPTFLAGS) include $(SRC_PATH)/common.mak diff --git a/vhook/Makefile b/vhook/Makefile index f6ce7f996c..808ac56ceb 100644 --- a/vhook/Makefile +++ b/vhook/Makefile @@ -2,7 +2,7 @@ include ../config.mak VPATH=$(SRC_PATH)/vhook -CFLAGS=-I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \ +CFLAGS=-I$(BUILD_ROOT) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil -I$(SRC_PATH)/libavcodec \ -I$(SRC_PATH)/libavformat $(VHOOKCFLAGS) -DHAVE_AV_CONFIG_H LDFLAGS+= -g |