[CRIU] [PATCH 10/24] Makefiles: rm -I compel/plugins... from cflags

[Kir Kolyshkin]

I have noticed compel/plugins/include[/uapi] is not needed,
not entirely sure why (added symlinks?) but everything
compiles just fine without it.

Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
 compel/Makefile            | 2 --
 compel/plugins/Makefile    | 2 --
 criu/Makefile              | 1 -
 criu/Makefile.crtools      | 1 -
 criu/arch/aarch64/Makefile | 1 -
 criu/arch/arm/Makefile     | 1 -
 criu/arch/ppc64/Makefile   | 1 -
 criu/arch/x86/Makefile     | 1 -
 criu/pie/Makefile          | 1 -
 criu/pie/Makefile.library  | 1 -
 10 files changed, 12 deletions(-)

diff --git a/compel/Makefile b/compel/Makefile
index ef932fe..1d2230c 100644
--- a/compel/Makefile
+++ b/compel/Makefile
@@ -5,14 +5,12 @@ COMPEL_SO_VERSION_CODE	:= $(shell expr $(COMPEL_SO_VERSION_MAJOR) \* 65536 \+ $(
 ccflags-y		+= -DINCLUDEDIR=\"$(INCLUDEDIR)\"
 ccflags-y		+= -iquote compel/arch/$(ARCH)/src/lib/include
 ccflags-y		+= -iquote compel/include
-ccflags-y		+= -iquote compel/plugins/include
 ccflags-y		+= -fno-strict-aliasing
 ccflags-y		+= -fPIC
 
 #
 # UAPI inclusion, referred as <compel/...>
 ccflags-y		+= -I compel/include/uapi
-ccflags-y		+= -I compel/plugins/include/uapi
 
 lib-name		:= $(LIBCOMPEL_A)
 lib-y			+= src/lib/log.o
diff --git a/compel/plugins/Makefile b/compel/plugins/Makefile
index 8073555..5873240 100644
--- a/compel/plugins/Makefile
+++ b/compel/plugins/Makefile
@@ -9,9 +9,7 @@ PLUGIN_ARCH_DIR		:= compel/arch/$(ARCH)/plugins
 #
 # UAPI inclusion, referred as <compel/...>
 ccflags-y		+= -I compel/include/uapi
-ccflags-y		+= -I compel/plugins/include/uapi
 asflags-y		+= -I compel/include/uapi
-asflags-y		+= -I compel/plugins/include/uapi
 
 # General compel includes
 ccflags-y		+= -iquote $(SRC_DIR)/compel/include
diff --git a/criu/Makefile b/criu/Makefile
index e580f1a..f8e6b82 100644
--- a/criu/Makefile
+++ b/criu/Makefile
@@ -18,7 +18,6 @@ ccflags-y		+= -iquote $(SRC_DIR)/$(ARCH_DIR)/include
 ccflags-y		+= -iquote $(SRC_DIR)/
 ccflags-y		+= -I/usr/include/libnl3
 ccflags-y		+= -I compel/include/uapi
-ccflags-y		+= -I compel/plugins/include/uapi
 
 export ccflags-y
 
diff --git a/criu/Makefile.crtools b/criu/Makefile.crtools
index 2e403f3..fa95058 100644
--- a/criu/Makefile.crtools
+++ b/criu/Makefile.crtools
@@ -1,6 +1,5 @@
 ccflags-y		+= -iquote criu/$(ARCH)
 ccflags-y		+= -I compel/include/uapi
-ccflags-y		+= -I compel/plugins/include/uapi
 
 obj-y			+= action-scripts.o
 obj-y			+= external.o
diff --git a/criu/arch/aarch64/Makefile b/criu/arch/aarch64/Makefile
index 7632e59..0b05dd1 100644
--- a/criu/arch/aarch64/Makefile
+++ b/criu/arch/aarch64/Makefile
@@ -4,7 +4,6 @@ ccflags-y		+= -iquote $(obj) -iquote $(SRC_DIR)
 ccflags-y		+= -iquote $(obj)/include -iquote $(SRC_DIR)/criu/include
 ccflags-y		+= -iquote $(SRC_DIR)/include
 ccflags-y		+= -I compel/include/uapi
-ccflags-y		+= -I compel/plugins/include/uapi
 
 obj-y			+= cpu.o
 obj-y			+= crtools.o
diff --git a/criu/arch/arm/Makefile b/criu/arch/arm/Makefile
index fb21121..719dd49 100644
--- a/criu/arch/arm/Makefile
+++ b/criu/arch/arm/Makefile
@@ -4,7 +4,6 @@ ccflags-y		+= -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
 ccflags-y		+= -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
 
 ccflags-y		+= -I compel/include/uapi
-ccflags-y		+= -I compel/plugins/include/uapi
 
 obj-y			+= cpu.o
 obj-y			+= crtools.o
diff --git a/criu/arch/ppc64/Makefile b/criu/arch/ppc64/Makefile
index 12b8ad2..7f767bb 100644
--- a/criu/arch/ppc64/Makefile
+++ b/criu/arch/ppc64/Makefile
@@ -3,7 +3,6 @@ builtin-name		:= crtools.built-in.o
 ccflags-y		+= -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
 ccflags-y		+= -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
 ccflags-y		+= -I compel/include/uapi
-ccflags-y		+= -I compel/plugins/include/uapi
 
 obj-y			+= cpu.o
 obj-y			+= crtools.o
diff --git a/criu/arch/x86/Makefile b/criu/arch/x86/Makefile
index 6744f9a..7217068 100644
--- a/criu/arch/x86/Makefile
+++ b/criu/arch/x86/Makefile
@@ -3,7 +3,6 @@ builtin-name		:= crtools.built-in.o
 ccflags-y		+= -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
 ccflags-y		+= -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
 ccflags-y		+= -I compel/include/uapi
-ccflags-y		+= -I compel/plugins/include/uapi
 
 asflags-y		+= -Wstrict-prototypes -Wa,--noexecstack
 asflags-y		+= -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer
diff --git a/criu/pie/Makefile b/criu/pie/Makefile
index 8906112..c06fb01 100644
--- a/criu/pie/Makefile
+++ b/criu/pie/Makefile
@@ -29,7 +29,6 @@ CFLAGS		+= -iquote $(SRC_DIR)/include
 CFLAGS		+= -iquote $(SRC_DIR)
 
 ccflags-y	+= -I compel/include/uapi
-ccflags-y	+= -I compel/plugins/include/uapi
 ccflags-y	+= -DCR_NOGLIBC
 ccflags-y	+= -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 
diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
index a675a63..10c7b8a 100644
--- a/criu/pie/Makefile.library
+++ b/criu/pie/Makefile.library
@@ -42,7 +42,6 @@ iquotes			+= -iquote $(SRC_DIR)/$(ARCH_DIR)/include
 iquotes			+= -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
 CFLAGS			:= $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS)) $(iquotes)
 asflags-y		:= -D__ASSEMBLY__ $(iquotes)
-ccflags-y		+= -I compel/plugins/include/uapi
 ccflags-y		+= -I compel/include/uapi
 
 ifeq ($(SRCARCH),arm)
-- 
2.7.4