From cbeee4d8e5be247ab8eea3eeda95b08d208b2908 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sat, 7 Oct 2006 09:22:44 +0000
Subject: [PATCH] Replace -I../-I. by -I$(BUILD_ROOT).
Originally committed as revision 6572 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
Makefile | 2 +-
libavcodec/Makefile | 3 +--
libavformat/Makefile | 2 +-
libavutil/Makefile | 3 +--
libpostproc/Makefile | 2 +-
vhook/Makefile | 2 +-
6 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index bf00a3e72ca..7d3f075e899 100644
--- a/Makefile
+++ b/Makefile
@@ -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 e091dba8d00..ac1c88bd29b 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 a9a4632e0a4..00048892ee9 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 045041465fc..b46c6271c07 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 7a10860c4e6..f7619c31feb 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 f6ce7f996cc..808ac56ceb8 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
--
GitLab