[CRIU] [PATCH 6/6] Makefiles: get rid of extra includes

[Kir Kolyshkin]

Tag: взять-и-уебать
Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 criu/Makefile              | 1 -
 criu/arch/aarch64/Makefile | 1 -
 criu/arch/arm/Makefile     | 2 +-
 criu/arch/ppc64/Makefile   | 2 +-
 criu/arch/x86/Makefile     | 2 +-
 criu/pie/Makefile          | 3 ---
 criu/pie/Makefile.library  | 2 --
 7 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/criu/Makefile b/criu/Makefile
index 3275d0a..ec9b6fc 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -21,7 +21,6 @@ ccflags-y		+= -iquote criu/include
 ccflags-y		+= -iquote include
 ccflags-y		+= -iquote images
 ccflags-y		+= -iquote criu/pie
-ccflags-y		+= -iquote $(ARCH_DIR)
 ccflags-y		+= -iquote $(ARCH_DIR)/include
 ccflags-y		+= -iquote .
 ccflags-y		+= -I/usr/include/libnl3
diff --git a/criu/arch/aarch64/Makefile b/criu/arch/aarch64/Makefile
index 4203e3d..0dc6350 100644
--- a/criu/arch/aarch64/Makefile
+++ b/criu/arch/aarch64/Makefile
@@ -1,6 +1,5 @@
 builtin-name		:= crtools.built-in.o
 
-ccflags-y		+= -iquote $(obj)
 ccflags-y		+= -iquote $(obj)/include -iquote criu/include
 ccflags-y		+= -iquote include
 ccflags-y		+= $(COMPEL_UAPI_INCLUDES)
diff --git a/criu/arch/arm/Makefile b/criu/arch/arm/Makefile
index 07daec7..1b0bc56 100644
--- a/criu/arch/arm/Makefile
+++ b/criu/arch/arm/Makefile
@@ -1,6 +1,6 @@
 builtin-name		:= crtools.built-in.o
 
-ccflags-y		+= -iquote $(obj) -iquote $(obj)/include
+ccflags-y		+= -iquote $(obj)/include
 ccflags-y		+= -iquote criu/include -iquote include
 ccflags-y		+= $(COMPEL_UAPI_INCLUDES)
 
diff --git a/criu/arch/ppc64/Makefile b/criu/arch/ppc64/Makefile
index 177ea31..8148dc9 100644
--- a/criu/arch/ppc64/Makefile
+++ b/criu/arch/ppc64/Makefile
@@ -1,6 +1,6 @@
 builtin-name		:= crtools.built-in.o
 
-ccflags-y		+= -iquote $(obj) -iquote $(obj)/include
+ccflags-y		+= -iquote $(obj)/include
 ccflags-y		+= -iquote criu/include -iquote include
 ccflags-y		+= $(COMPEL_UAPI_INCLUDES)
 
diff --git a/criu/arch/x86/Makefile b/criu/arch/x86/Makefile
index 0e1717c..9ff5994 100644
--- a/criu/arch/x86/Makefile
+++ b/criu/arch/x86/Makefile
@@ -1,6 +1,6 @@
 builtin-name		:= crtools.built-in.o
 
-ccflags-y		+= -iquote $(obj) -iquote . -iquote $(obj)/include
+ccflags-y		+= -iquote $(obj)/include
 ccflags-y		+= -iquote criu/include -iquote include
 ccflags-y		+= $(COMPEL_UAPI_INCLUDES)
 
diff --git a/criu/pie/Makefile b/criu/pie/Makefile
index 88d376c..90c09bd 100644
--- a/criu/pie/Makefile
+++ b/criu/pie/Makefile
@@ -19,9 +19,6 @@ endif
 #
 CFLAGS		:= $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS))
 CFLAGS		:= $(filter-out $(CFLAGS-ASAN),$(CFLAGS))
-CFLAGS		+= -iquote criu/arch/$(ARCH)/include
-CFLAGS		+= -iquote criu/include
-CFLAGS		+= -iquote include
 
 ccflags-y	+= $(COMPEL_UAPI_INCLUDES)
 ccflags-y	+= -DCR_NOGLIBC
diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index 7fe2596..78da25d 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -34,8 +34,6 @@ endif
 # applications, which is not the target of the
 # project.
 #
-iquotes			+= -iquote $(ARCH_DIR)/include
-iquotes			+= -iquote criu/include -iquote include
 CFLAGS			:= $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes)
 CFLAGS			:= $(filter-out $(CFLAGS-ASAN),$(CFLAGS))
 
-- 
2.9.3