Add directory for common headers

The idea is to have one place for headers which
are shared between subprojects (zdtm, criu, compel).

travis-ci: success for Add directory for common headers (rev3)
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>

criu/Makefile

@@ -10,6 +10,7 @@ export ARCH_DIR PIE_DIR
 # General flags.
 ccflags-y		+= -fno-strict-aliasing
 ccflags-y		+= -iquote $(SRC_DIR)/criu/include
+ccflags-y		+= -iquote $(SRC_DIR)/include
 ccflags-y		+= -iquote $(SRC_DIR)/images
 ccflags-y		+= -iquote $(SRC_DIR)/criu/pie
 ccflags-y		+= -iquote $(SRC_DIR)/$(ARCH_DIR)

criu/action-scripts.c

@@ -4,7 +4,7 @@
 #include <stdlib.h>
 
 #include "cr_options.h"
-#include "list.h"
+#include "common/list.h"
 #include "xmalloc.h"
 #include "log.h"
 #include "servicefd.h"

criu/arch/aarch64/Makefile

@@ -2,6 +2,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
 
 obj-y			+= cpu.o
 obj-y			+= crtools.o

criu/arch/arm/Makefile

 builtin-name		:= crtools.built-in.o
 
-ccflags-y		+= -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include -iquote $(SRC_DIR)/criu/include
+ccflags-y		+= -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
+ccflags-y		+= -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
 
 obj-y			+= cpu.o
 obj-y			+= crtools.o

criu/arch/ppc64/Makefile

 builtin-name		:= crtools.built-in.o
 
-ccflags-y		+= -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include -iquote $(SRC_DIR)/criu/include
+ccflags-y		+= -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
+ccflags-y		+= -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
 
 obj-y			+= cpu.o
 obj-y			+= crtools.o

criu/arch/x86/Makefile

 builtin-name		:= crtools.built-in.o
 
-ccflags-y		+= -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include -iquote $(SRC_DIR)/criu/include
+ccflags-y		+= -iquote $(obj) -iquote $(SRC_DIR) -iquote $(obj)/include
+ccflags-y		+= -iquote $(SRC_DIR)/criu/include -iquote $(SRC_DIR)/include
 
 obj-y			+= cpu.o
 obj-y			+= crtools.o

criu/bfd.c

@@ -10,7 +10,7 @@
 #include "bug.h"
 #include "log.h"
 #include "bfd.h"
-#include "list.h"
+#include "common/list.h"
 #include "util.h"
 #include "xmalloc.h"
 #include "asm/page.h"

criu/cgroup-props.c

@@ -15,7 +15,7 @@
 #include "xmalloc.h"
 #include "string.h"
 #include "util.h"
-#include "list.h"
+#include "common/list.h"
 #include "log.h"
 #include "bug.h"
 

criu/cgroup.c

@@ -7,7 +7,7 @@
 #include <sys/stat.h>
 #include <ftw.h>
 #include <libgen.h>
-#include "list.h"
+#include "common/list.h"
 #include "xmalloc.h"
 #include "cgroup.h"
 #include "cgroup-props.h"

criu/cr-dump.c

@@ -33,7 +33,7 @@
 #include "images/siginfo.pb-c.h"
 
 #include "asm/types.h"
-#include "list.h"
+#include "common/list.h"
 #include "imgset.h"
 #include "file-ids.h"
 #include "kcmp-ids.h"

criu/external.c

-#include "list.h"
+#include "common/list.h"
 #include "cr_options.h"
 #include "xmalloc.h"
 #include "external.h"

criu/files-reg.c

@@ -20,7 +20,7 @@
 #include "file-ids.h"
 #include "mount.h"
 #include "files.h"
-#include "list.h"
+#include "common/list.h"
 #include "rst-malloc.h"
 #include "fs-magic.h"
 #include "asm/atomic.h"

criu/files.c

@@ -18,7 +18,7 @@
 #include "files-reg.h"
 #include "file-lock.h"
 #include "image.h"
-#include "list.h"
+#include "common/list.h"
 #include "rst-malloc.h"
 #include "util-pie.h"
 #include "lock.h"

criu/fsnotify.c

@@ -35,7 +35,7 @@
 #include "files-reg.h"
 #include "file-ids.h"
 #include "log.h"
-#include "list.h"
+#include "common/list.h"
 #include "lock.h"
 #include "irmap.h"
 #include "cr_options.h"

criu/include/cr_options.h

@@ -3,7 +3,7 @@
 
 #include <stdbool.h>
 
-#include "list.h"
+#include "common/list.h"
 
 /*
  * CPU capability options.

criu/include/crtools.h

@@ -3,7 +3,7 @@
 
 #include <sys/types.h>
 
-#include "list.h"
+#include "common/list.h"
 #include "asm/types.h"
 #include "servicefd.h"
 

criu/include/fdinfo.h

 #ifndef __CR_FDINFO_H__
 #define __CR_FDINFO_H__
 
-#include "list.h"
+#include "common/list.h"
 
 #include "images/eventfd.pb-c.h"
 #include "images/eventpoll.pb-c.h"

criu/include/file-lock.h

 #ifndef __FILE_LOCK_H__
 #define __FILE_LOCK_H__
 
-#include "list.h"
+#include "common/list.h"
 
 #include "protobuf.h"
 #include "images/file-lock.pb-c.h"

criu/include/files.h

@@ -7,7 +7,7 @@
 #include "asm/types.h"
 #include "fcntl.h"
 #include "lock.h"
-#include "list.h"
+#include "common/list.h"
 #include "pid.h"
 #include "rst_info.h"
 

criu/include/mount.h

@@ -4,7 +4,7 @@
 #include <sys/types.h>
 
 #include "asm/types.h"
-#include "list.h"
+#include "common/list.h"
 
 struct proc_mountinfo;
 struct pstree_item;

criu/include/namespaces.h

@@ -3,7 +3,7 @@
 
 #include "compiler.h"
 #include "files.h"
-#include "list.h"
+#include "common/list.h"
 
 #ifndef CLONE_NEWNS
 #define CLONE_NEWNS	0x00020000

criu/include/net.h

 #ifndef __CR_NET_H__
 #define __CR_NET_H__
 
-#include "list.h"
+#include "common/list.h"
 
 struct cr_imgset;
 extern int dump_net_ns(int ns_id);

criu/include/page-pipe.h

@@ -2,7 +2,7 @@
 #define __CR_PAGE_PIPE_H__
 
 #include <sys/uio.h>
-#include "list.h"
+#include "common/list.h"
 
 /*
  * page_pipe is a descriptor of task's virtual memory

criu/include/pagemap-cache.h

@@ -5,7 +5,7 @@
 #include "asm/page.h"
 #include "asm/int.h"
 
-#include "list.h"
+#include "common/list.h"
 
 struct vma_area;
 

criu/include/parasite-syscall.h

@@ -3,7 +3,7 @@
 
 #include "asm/types.h"
 #include "pid.h"
-#include "list.h"
+#include "common/list.h"
 #include "config.h"
 
 #define BUILTIN_SYSCALL_SIZE	8

criu/include/plugin.h

@@ -3,7 +3,7 @@
 
 #include "criu-plugin.h"
 #include "compiler.h"
-#include "list.h"
+#include "common/list.h"
 
 #define CR_PLUGIN_DEFAULT "/var/lib/criu/"
 

criu/include/posix-timer.h

 #ifndef __CR_PROC_POSIX_TIMER_H__
 #define __CR_PROC_POSIX_TIMER_H__
 
-#include "list.h"
+#include "common/list.h"
 
 struct str_posix_timer {
 	long it_id;

criu/include/pstree.h

 #ifndef __CR_PSTREE_H__
 #define __CR_PSTREE_H__
 
-#include "list.h"
+#include "common/list.h"
 #include "pid.h"
 #include "images/core.pb-c.h"
 

criu/include/rst_info.h

@@ -2,7 +2,7 @@
 #define __CR_RST_INFO_H__
 
 #include "lock.h"
-#include "list.h"
+#include "common/list.h"
 #include "vma.h"
 
 struct task_entries {

criu/include/sk-inet.h

@@ -5,7 +5,7 @@
 
 #include "sockets.h"
 #include "files.h"
-#include "list.h"
+#include "common/list.h"
 #include "protobuf.h"
 #include "images/sk-inet.pb-c.h"
 

criu/include/vma.h

@@ -3,7 +3,7 @@
 
 #include "asm/types.h"
 #include "image.h"
-#include "list.h"
+#include "common/list.h"
 
 #include "images/vma.pb-c.h"
 

criu/netfilter.c

@@ -7,7 +7,7 @@
 
 #include "asm/types.h"
 #include "util.h"
-#include "list.h"
+#include "common/list.h"
 #include "files.h"
 #include "netfilter.h"
 #include "sockets.h"

criu/pie/Makefile

@@ -19,6 +19,7 @@ CFLAGS			:= $(filter-out -pg $(CFLAGS-GCOV),$(CFLAGS))
 CFLAGS			+= -iquote $(SRC_DIR)/criu/pie/piegen
 CFLAGS			+= -iquote $(SRC_DIR)/criu/arch/$(ARCH)/include
 CFLAGS			+= -iquote $(SRC_DIR)/criu/include
+CFLAGS			+= -iquote $(SRC_DIR)/include
 CFLAGS			+= -iquote $(SRC_DIR)
 
 

criu/pie/Makefile.library

@@ -30,7 +30,7 @@ endif
 #
 iquotes			:= -iquote $(SRC_DIR)/$(PIE_DIR)/piegen
 iquotes			+= -iquote $(SRC_DIR)/$(ARCH_DIR)/include
-iquotes			+= -iquote $(SRC_DIR) -iquote $(SRC_DIR)/criu/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)
 

criu/plugin.c

@@ -10,7 +10,7 @@
 #include "compiler.h"
 #include "xmalloc.h"
 #include "plugin.h"
-#include "list.h"
+#include "common/list.h"
 #include "log.h"
 
 cr_plugin_ctl_t cr_plugin_ctl = {

criu/proc_parse.c

@@ -11,7 +11,7 @@
 #include <linux/fs.h>
 
 #include "asm/types.h"
-#include "list.h"
+#include "common/list.h"
 #include "util.h"
 #include "mount.h"
 #include "filesystems.h"

criu/shmem.c

@@ -4,7 +4,7 @@
 #include <fcntl.h>
 #include <stdbool.h>
 
-#include "list.h"
+#include "common/list.h"
 #include "pid.h"
 #include "shmem.h"
 #include "image.h"

criu/sk-queue.c

@@ -11,7 +11,7 @@
 #include <sys/sendfile.h>
 
 #include "asm/types.h"
-#include "list.h"
+#include "common/list.h"
 #include "imgset.h"
 #include "image.h"
 #include "servicefd.h"

criu/sk-tcp.c

@@ -10,7 +10,7 @@
 
 #include "cr_options.h"
 #include "util.h"
-#include "list.h"
+#include "common/list.h"
 #include "log.h"
 #include "asm/types.h"
 #include "files.h"

criu/tty.c

@@ -22,7 +22,7 @@
 #include "servicefd.h"
 #include "rst-malloc.h"
 #include "log.h"
-#include "list.h"
+#include "common/list.h"
 #include "util-pie.h"
 #include "proc_parse.h"
 #include "file-ids.h"

criu/util.c

@@ -37,7 +37,7 @@
 
 #include "compiler.h"
 #include "asm/types.h"
-#include "list.h"
+#include "common/list.h"
 #include "util.h"
 #include "rst-malloc.h"
 #include "image.h"