[CRIU] [PATCH 14/38] compel: Don't look into CRIU include folder

[Cyrill Gorcunov]

compel must be able to build without CRIU at all,
so if header is needed -- use symlink.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 compel/Makefile                                 | 1 -
 compel/include/asm-generic/int.h                | 1 +
 compel/include/int.h                            | 1 -
 compel/plugins/include/uapi/std/syscall-types.h | 2 +-
 compel/plugins/std/std.c                        | 2 +-
 5 files changed, 3 insertions(+), 4 deletions(-)
 create mode 120000 compel/include/asm-generic/int.h
 delete mode 120000 compel/include/int.h

diff --git a/compel/Makefile b/compel/Makefile
index d9e75ffd5e34..a27089e0d26e 100644
--- a/compel/Makefile
+++ b/compel/Makefile
@@ -7,7 +7,6 @@ COMPEL_SO_VERSION_CODE	:= $(shell expr $(COMPEL_SO_VERSION_MAJOR) \* 65536 \+ $(
 ccflags-y		+= -iquote compel/arch/$(ARCH)/src/lib/include
 ccflags-y		+= -iquote compel/include
 ccflags-y		+= -iquote compel/plugins/include
-ccflags-y		+= -iquote $(SRC_DIR)/criu/include
 ccflags-y		+= -fPIC
 
 lib-y			+= arch/$(ARCH)/src/lib/handle-elf.o
diff --git a/compel/include/asm-generic/int.h b/compel/include/asm-generic/int.h
new file mode 120000
index 000000000000..40be48fa5d8e
--- /dev/null
+++ b/compel/include/asm-generic/int.h
@@ -0,0 +1 @@
+../../../criu/include/asm-generic/int.h
\ No newline at end of file
diff --git a/compel/include/int.h b/compel/include/int.h
deleted file mode 120000
index 5c118d596759..000000000000
--- a/compel/include/int.h
+++ /dev/null
@@ -1 +0,0 @@
-../../criu/include/asm-generic/int.h
\ No newline at end of file
diff --git a/compel/plugins/include/uapi/std/syscall-types.h b/compel/plugins/include/uapi/std/syscall-types.h
index 3296153b39a0..c311ed76c299 100644
--- a/compel/plugins/include/uapi/std/syscall-types.h
+++ b/compel/plugins/include/uapi/std/syscall-types.h
@@ -14,7 +14,7 @@
 #include <fcntl.h>
 #include <time.h>
 
-#include "int.h"
+#include "asm-generic/int.h"
 
 struct cap_header {
 	u32 version;
diff --git a/compel/plugins/std/std.c b/compel/plugins/std/std.c
index ada3f09d21a3..a1f14ce3a3dd 100644
--- a/compel/plugins/std/std.c
+++ b/compel/plugins/std/std.c
@@ -1,6 +1,6 @@
 #include <sys/types.h>
 
-#include "int.h"
+#include "asm-generic/int.h"
 #include "uapi/plugins.h"
 #include "uapi/plugin-std.h"
 
-- 
2.7.4