headers: Change "../protobuf/" to "protobuf/"

No need to walk up the directories if we need
to include protobuf file. This was always a bad
use of ability to walk the filesystem from other
headers.

Same time we don't need -I$(SRC_DIR)/protobuf/
in general makefile anymore.

[xemul: Small fixlet in head Makefile, since patch
 it out-of-order]
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>

Makefile

@@ -59,7 +59,7 @@ ARCH_DIR	:= $(SRC_DIR)/arch/$(ARCH)
 
 $(if $(wildcard $(ARCH_DIR)),,$(error "The architecture $(ARCH) isn't supported"))
 
-CFLAGS		+= -I$(SRC_DIR)/include -I$(SRC_DIR)/pie -I$(ARCH_DIR)
+CFLAGS		+= -I$(SRC_DIR)/include -I$(SRC_DIR)/pie -I$(ARCH_DIR) -I$(SRC_DIR)
 CFLAGS		+= -iquote $(ARCH_DIR)/include -fno-strict-aliasing
 
 LIBS		:= -lrt -lpthread -lprotobuf-c

arch/arm/crtools.c

@@ -6,8 +6,8 @@
 #include "ptrace.h"
 #include "asm/processor-flags.h"
 #include "protobuf.h"
-#include "../protobuf/core.pb-c.h"
-#include "../protobuf/creds.pb-c.h"
+#include "protobuf/core.pb-c.h"
+#include "protobuf/creds.pb-c.h"
 #include "parasite-syscall.h"
 #include "syscall.h"
 #include "log.h"

arch/arm/include/asm/restorer.h

@@ -2,7 +2,7 @@
 #define __CR_ASM_RESTORER_H__
 
 #include "asm/types.h"
-#include "../protobuf/core.pb-c.h"
+#include "protobuf/core.pb-c.h"
 
 /* Copied from the Linux kernel header arch/arm/include/asm/sigcontext.h */
 

arch/arm/include/asm/types.h

@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <signal.h>
-#include "../protobuf/core.pb-c.h"
+#include "protobuf/core.pb-c.h"
 
 #include "asm/bitops.h"
 

arch/x86/crtools.c

@@ -6,8 +6,8 @@
 #include "ptrace.h"
 #include "asm/processor-flags.h"
 #include "protobuf.h"
-#include "../protobuf/core.pb-c.h"
-#include "../protobuf/creds.pb-c.h"
+#include "protobuf/core.pb-c.h"
+#include "protobuf/creds.pb-c.h"
 #include "parasite-syscall.h"
 #include "syscall.h"
 #include "log.h"

arch/x86/include/asm/restorer.h

@@ -2,7 +2,7 @@
 #define __CR_ASM_RESTORER_H__
 
 #include "asm/types.h"
-#include "../protobuf/core.pb-c.h"
+#include "protobuf/core.pb-c.h"
 
 struct pt_regs {
 	unsigned long	r15;

arch/x86/include/asm/types.h

@@ -7,7 +7,7 @@
 
 #include "asm/bitops.h"
 
-#include "../protobuf/core.pb-c.h"
+#include "protobuf/core.pb-c.h"
 
 /* prctl */
 #define ARCH_SET_GS 0x1001

include/crtools.h

@@ -10,7 +10,7 @@
 #include "image.h"
 #include "lock.h"
 
-#include "../protobuf/vma.pb-c.h"
+#include "protobuf/vma.pb-c.h"
 
 #define CR_FD_PERM		(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH)
 

include/file-ids.h

@@ -5,7 +5,7 @@
 #include "asm/types.h"
 #include "rbtree.h"
 
-#include "../protobuf/fdinfo.pb-c.h"
+#include "protobuf/fdinfo.pb-c.h"
 
 #define FD_PID_INVALID		(-2U)
 #define FD_DESC_INVALID		(-3U)

include/file-lock.h

@@ -3,7 +3,7 @@
 
 #include "crtools.h"
 #include "protobuf.h"
-#include "../protobuf/file-lock.pb-c.h"
+#include "protobuf/file-lock.pb-c.h"
 
 #define FL_POSIX	1
 #define FL_FLOCK	2

include/files-reg.h

@@ -5,8 +5,8 @@
 #include "files.h"
 #include "image.h"
 
-#include "../protobuf/regfile.pb-c.h"
-#include "../protobuf/ghost-file.pb-c.h"
+#include "protobuf/regfile.pb-c.h"
+#include "protobuf/ghost-file.pb-c.h"
 
 struct cr_fdset;
 struct fd_parms;

include/files.h

@@ -7,9 +7,9 @@
 #include "list.h"
 #include "image.h"
 
-#include "../protobuf/fdinfo.pb-c.h"
-#include "../protobuf/fown.pb-c.h"
-#include "../protobuf/vma.pb-c.h"
+#include "protobuf/fdinfo.pb-c.h"
+#include "protobuf/fown.pb-c.h"
+#include "protobuf/vma.pb-c.h"
 
 struct pstree_item;
 struct file_desc;

include/parasite.h

@@ -13,7 +13,7 @@
 #include "image.h"
 #include "util-net.h"
 
-#include "../protobuf/vma.pb-c.h"
+#include "protobuf/vma.pb-c.h"
 
 #define __head __used __section(.head.text)
 

include/pipes.h

 #ifndef __CR_PIPES_H__
 #define __CR_PIPES_H__
 
-#include "../protobuf/pipe-data.pb-c.h"
+#include "protobuf/pipe-data.pb-c.h"
 
 extern int collect_pipes(void);
 extern void mark_pipe_master(void);

include/proc_parse.h

@@ -6,10 +6,10 @@
 #include "image.h"
 #include "list.h"
 
-#include "../protobuf/eventfd.pb-c.h"
-#include "../protobuf/eventpoll.pb-c.h"
-#include "../protobuf/signalfd.pb-c.h"
-#include "../protobuf/fsnotify.pb-c.h"
+#include "protobuf/eventfd.pb-c.h"
+#include "protobuf/eventpoll.pb-c.h"
+#include "protobuf/signalfd.pb-c.h"
+#include "protobuf/fsnotify.pb-c.h"
 
 #define PROC_TASK_COMM_LEN	32
 #define PROC_TASK_COMM_LEN_FMT	"(%31s"

include/pstree.h

@@ -3,7 +3,7 @@
 
 #include "list.h"
 #include "crtools.h"
-#include "../protobuf/core.pb-c.h"
+#include "protobuf/core.pb-c.h"
 
 /*
  * That's the init process which usually inherit

include/restorer.h

@@ -13,10 +13,10 @@
 #include "crtools.h"
 #include "fpu.h"
 
-#include "../protobuf/mm.pb-c.h"
-#include "../protobuf/vma.pb-c.h"
-#include "../protobuf/creds.pb-c.h"
-#include "../protobuf/core.pb-c.h"
+#include "protobuf/mm.pb-c.h"
+#include "protobuf/vma.pb-c.h"
+#include "protobuf/creds.pb-c.h"
+#include "protobuf/core.pb-c.h"
 
 struct task_restore_core_args;
 struct thread_restore_args;

include/shmem.h

 #ifndef __CR_SHMEM_H__
 #define __CR_SHMEM_H__
 
-#include "../protobuf/vma.pb-c.h"
+#include "protobuf/vma.pb-c.h"
 
 int prepare_shmem_pid(int pid);
 int prepare_shmem_restore(void);

include/sk-inet.h

@@ -7,7 +7,7 @@
 #include "files.h"
 #include "list.h"
 #include "protobuf.h"
-#include "../protobuf/sk-inet.pb-c.h"
+#include "protobuf/sk-inet.pb-c.h"
 
 #define INET_ADDR_LEN		40
 #ifndef TCP_REPAIR

include/sockets.h

@@ -9,7 +9,7 @@
 #include "asm/types.h"
 
 #include "protobuf.h"
-#include "../protobuf/sk-opts.pb-c.h"
+#include "protobuf/sk-opts.pb-c.h"
 
 struct fdinfo_list_entry;
 struct sk_opts_entry;

include/util.h

@@ -16,7 +16,7 @@
 #include "asm/types.h"
 #include "log.h"
 
-#include "../protobuf/vma.pb-c.h"
+#include "protobuf/vma.pb-c.h"
 
 #define PREF_SHIFT_OP(pref, op, size)	((size) op (pref ##BYTES_SHIFT))
 #define KBYTES_SHIFT	10

pie/Makefile

-CFLAGS		+= -c -I$(SRC_DIR)/protobuf/ -I$(SRC_DIR)/syscall/
+CFLAGS		+= -c -I$(SRC_DIR)/syscall/
 CFLAGS		+=  -fpie  -Wa,--noexecstack -fno-strict-aliasing
 
 GEN-OFFSETS	:= gen-offsets.sh

pie/restorer.c

@@ -25,7 +25,7 @@
 #include "lock.h"
 #include "restorer.h"
 
-#include "creds.pb-c.h"
+#include "protobuf/creds.pb-c.h"
 
 #include "asm/restorer.h"