Replace -I../-I. by -I$(BUILD_ROOT).

Originally committed as revision 6572 to svn://svn.ffmpeg.org/ffmpeg/trunk
19 years ago · cbeee4d8e5
parent 4aad0d6db6
commit cbeee4d8e5
6 changed files with 6 additions and 8 deletions
--- a/2
+++ b/2
@ -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
--- 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 \
--- 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

--- 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 \
--- 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

--- 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