criu Makefiles: use compel includes

Instead of hardcoding the path to compel uapi includes,
call compel tool to get one.

travis-ci: success for More polishing for compel cli
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

criu/Makefile

@@ -6,6 +6,11 @@ ARCH_DIR		:= criu/arch/$(SRCARCH)
 PIE_DIR			:= criu/pie
 export ARCH_DIR PIE_DIR
 
+ifeq ($(filter clean mrproper,$(MAKECMDGOALS)),)
+	COMPEL_UAPI_INCLUDES	:= $(shell $(COMPEL_BIN) includes)
+	export COMPEL_UAPI_INCLUDES
+endif
+
 #
 # General flags.
 ccflags-y		+= -fno-strict-aliasing
@@ -17,7 +22,7 @@ ccflags-y		+= -iquote $(SRC_DIR)/$(ARCH_DIR)
 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		+= $(COMPEL_UAPI_INCLUDES)
 
 export ccflags-y
 

criu/Makefile.crtools

 ccflags-y		+= -iquote criu/$(ARCH)
-ccflags-y		+= -I compel/include/uapi
+ccflags-y		+= $(COMPEL_UAPI_INCLUDES)
 
 obj-y			+= action-scripts.o
 obj-y			+= external.o

criu/arch/aarch64/Makefile

@@ -3,7 +3,7 @@ builtin-name		:= crtools.built-in.o
 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		+= $(COMPEL_UAPI_INCLUDES)
 asflags-y		+= -D__ASSEMBLY__
 
 obj-y			+= cpu.o

criu/arch/arm/Makefile

@@ -3,7 +3,7 @@ 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		+= $(COMPEL_UAPI_INCLUDES)
 
 asflags-y		+= -D__ASSEMBLY__
 

criu/arch/ppc64/Makefile

@@ -2,7 +2,7 @@ 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		+= $(COMPEL_UAPI_INCLUDES)
 
 obj-y			+= cpu.o
 obj-y			+= crtools.o

criu/arch/x86/Makefile

@@ -2,7 +2,7 @@ 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		+= $(COMPEL_UAPI_INCLUDES)
 
 asflags-y		+= -Wstrict-prototypes -Wa,--noexecstack
 asflags-y		+= -D__ASSEMBLY__ -nostdlib -fomit-frame-pointer

criu/pie/Makefile

@@ -30,7 +30,7 @@ CFLAGS		+= -iquote $(SRC_DIR)
 CFLAGS		+= -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 CFLAGS		+= -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
 
-ccflags-y	+= -I compel/include/uapi
+ccflags-y	+= $(COMPEL_UAPI_INCLUDES)
 ccflags-y	+= -DCR_NOGLIBC
 ccflags-y	+= -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
 ccflags-y	+= -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0

criu/pie/Makefile.library

@@ -42,7 +42,7 @@ 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/include/uapi
+ccflags-y		+= $(COMPEL_UAPI_INCLUDES)
 
 ifeq ($(SRCARCH),arm)
 	ccflags-y	+= -marm