[CRIU] [PATCH 16/38] compel: Move headers to compel/include/compel

[Cyrill Gorcunov]

To not intersect with criu headers.

Signed-off-by: Cyrill Gorcunov <gorcunov at openvz.org>
---
 compel/Makefile                           | 3 ++-
 compel/include/compel/compiler.h          | 1 +
 compel/include/{ => compel}/elf32-types.h | 0
 compel/include/{ => compel}/elf64-types.h | 0
 compel/include/{ => compel}/log.h         | 0
 compel/include/{ => compel}/piegen.h      | 0
 compel/include/{ => compel}/shmem.h       | 0
 compel/include/compel/xmalloc.h           | 1 +
 compel/include/compiler.h                 | 1 -
 compel/include/xmalloc.h                  | 1 -
 compel/plugins/Makefile                   | 1 +
 11 files changed, 5 insertions(+), 3 deletions(-)
 create mode 120000 compel/include/compel/compiler.h
 rename compel/include/{ => compel}/elf32-types.h (100%)
 rename compel/include/{ => compel}/elf64-types.h (100%)
 rename compel/include/{ => compel}/log.h (100%)
 rename compel/include/{ => compel}/piegen.h (100%)
 rename compel/include/{ => compel}/shmem.h (100%)
 create mode 120000 compel/include/compel/xmalloc.h
 delete mode 120000 compel/include/compiler.h
 delete mode 120000 compel/include/xmalloc.h

diff --git a/compel/Makefile b/compel/Makefile
index a27089e0d26e..cf5973860a72 100644
--- a/compel/Makefile
+++ b/compel/Makefile
@@ -5,7 +5,8 @@ include $(SRC_DIR)/Makefile.versions
 COMPEL_SO_VERSION	:= $(COMPEL_SO_VERSION_MAJOR)$(if $(COMPEL_SO_VERSION_MINOR),.$(COMPEL_SO_VERSION_MINOR))$(if $(COMPEL_SO_VERSION_SUBLEVEL),.$(COMPEL_SO_VERSION_SUBLEVEL))
 COMPEL_SO_VERSION_CODE	:= $(shell expr $(COMPEL_SO_VERSION_MAJOR) \* 65536 \+ $(COMPEL_SO_VERSION_MINOR) \* 256 \+ $(COMPEL_SO_VERSION_SUBLEVEL))
 ccflags-y		+= -iquote compel/arch/$(ARCH)/src/lib/include
-ccflags-y		+= -iquote compel/include
+ccflags-y		+= -iquote compel/include/
+ccflags-y		+= -iquote compel/include/compel
 ccflags-y		+= -iquote compel/plugins/include
 ccflags-y		+= -fPIC
 
diff --git a/compel/include/compel/compiler.h b/compel/include/compel/compiler.h
new file mode 120000
index 000000000000..ab14103d453a
--- /dev/null
+++ b/compel/include/compel/compiler.h
@@ -0,0 +1 @@
+../../../criu/include/compiler.h
\ No newline at end of file
diff --git a/compel/include/elf32-types.h b/compel/include/compel/elf32-types.h
similarity index 100%
rename from compel/include/elf32-types.h
rename to compel/include/compel/elf32-types.h
diff --git a/compel/include/elf64-types.h b/compel/include/compel/elf64-types.h
similarity index 100%
rename from compel/include/elf64-types.h
rename to compel/include/compel/elf64-types.h
diff --git a/compel/include/log.h b/compel/include/compel/log.h
similarity index 100%
rename from compel/include/log.h
rename to compel/include/compel/log.h
diff --git a/compel/include/piegen.h b/compel/include/compel/piegen.h
similarity index 100%
rename from compel/include/piegen.h
rename to compel/include/compel/piegen.h
diff --git a/compel/include/shmem.h b/compel/include/compel/shmem.h
similarity index 100%
rename from compel/include/shmem.h
rename to compel/include/compel/shmem.h
diff --git a/compel/include/compel/xmalloc.h b/compel/include/compel/xmalloc.h
new file mode 120000
index 000000000000..09c0adb503b5
--- /dev/null
+++ b/compel/include/compel/xmalloc.h
@@ -0,0 +1 @@
+../../../criu/include/xmalloc.h
\ No newline at end of file
diff --git a/compel/include/compiler.h b/compel/include/compiler.h
deleted file mode 120000
index ef56d20f668e..000000000000
--- a/compel/include/compiler.h
+++ /dev/null
@@ -1 +0,0 @@
-../../criu/include/compiler.h
\ No newline at end of file
diff --git a/compel/include/xmalloc.h b/compel/include/xmalloc.h
deleted file mode 120000
index edd6ee11a91d..000000000000
--- a/compel/include/xmalloc.h
+++ /dev/null
@@ -1 +0,0 @@
-../../criu/include/xmalloc.h
\ No newline at end of file
diff --git a/compel/plugins/Makefile b/compel/plugins/Makefile
index 09587d1e023e..a3237d1d4bfe 100644
--- a/compel/plugins/Makefile
+++ b/compel/plugins/Makefile
@@ -8,6 +8,7 @@ PLUGIN_ARCH_DIR		:= compel/arch/$(ARCH)/plugins
 
 # General compel includes
 ccflags-y		+= -iquote $(SRC_DIR)/compel/include
+ccflags-y		+= -iquote $(SRC_DIR)/compel/include/compel
 ccflags-y		+= -fno-stack-protector
 
 # General compel/plugins includes
-- 
2.7.4