build: add src/include to build and simplify header inclusions

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

hooks/unmount-namespace.c

@@ -40,7 +40,7 @@
 #include <../src/config.h>
 
 #if IS_BIONIC
-#include <../src/include/lxcmntent.h>
+#include "lxcmntent.h"
 #else
 #include <mntent.h>
 #endif

src/lxc/Makefile.am

@@ -230,6 +230,7 @@ AM_CFLAGS += -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
 	     -DSBINDIR=\"$(SBINDIR)\" \
 	     -DAPPARMOR_CACHE_DIR=\"$(APPARMOR_CACHE_DIR)\" \
 	     -I $(top_srcdir)/src \
+	     -I $(top_srcdir)/src/include \
 	     -I $(top_srcdir)/src/lxc \
 	     -I $(top_srcdir)/src/lxc/storage \
 	     -I $(top_srcdir)/src/lxc/cgroups

src/lxc/af_unix.c

@@ -23,7 +23,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(af_unix, lxc);

src/lxc/cgroups/cgfsng.c

@@ -54,11 +54,11 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#include "strlcat.h"
 #endif
 
 lxc_log_define(cgfsng, cgroup);

src/lxc/cgroups/cgroup2_devices.h

@@ -24,8 +24,8 @@
 #include "memory_utils.h"
 #include "syscall_numbers.h"
 
-#include "include/bpf.h"
-#include "include/bpf_common.h"
+#include "bpf.h"
+#include "bpf_common.h"
 
 #ifndef HAVE_BPF
 static inline int bpf_lxc(int cmd, union bpf_attr *attr, size_t size)

src/lxc/cmd/lxc_user_nic.c

@@ -43,7 +43,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #define usernic_debug_stream(stream, format, ...)                              \

src/lxc/conf.c

@@ -75,7 +75,7 @@
 #if HAVE_OPENPTY
 #include <pty.h>
 #else
-#include <../include/openpty.h>
+#include "openpty.h"
 #endif
 
 #if HAVE_LIBCAP
@@ -83,25 +83,25 @@
 #endif
 
 #ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#include "strlcat.h"
 #endif
 
 #if IS_BIONIC
-#include <../include/lxcmntent.h>
+#include "lxcmntent.h"
 #else
 #include <mntent.h>
 #endif
 
 #if !defined(HAVE_PRLIMIT) && defined(HAVE_PRLIMIT64)
-#include <../include/prlimit.h>
+#include "prlimit.h"
 #endif
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #ifndef HAVE_STRCHRNUL
-#include "include/strchrnul.h"
+#include "strchrnul.h"
 #endif
 
 lxc_log_define(conf, lxc);

src/lxc/confile.c

@@ -29,7 +29,7 @@
 #include "config.h"
 #include "confile.h"
 #include "confile_utils.h"
-#include "../include/netns_ifaddrs.h"
+#include "netns_ifaddrs.h"
 #include "log.h"
 #include "lxcseccomp.h"
 #include "macro.h"
@@ -40,11 +40,11 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#include "strlcat.h"
 #endif
 
 lxc_log_define(confile, lxc);

src/lxc/confile_utils.c

@@ -25,7 +25,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(confile_utils, lxc);

src/lxc/criu.c

@@ -29,13 +29,13 @@
 #include "utils.h"
 
 #if IS_BIONIC
-#include <../include/lxcmntent.h>
+#include "lxcmntent.h"
 #else
 #include <mntent.h>
 #endif
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #define CRIU_VERSION		"2.0"

src/lxc/initutils.c

@@ -20,7 +20,7 @@
 #include "process_utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 static char *copy_global_config_value(char *p)

src/lxc/log.c

@@ -27,7 +27,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #if HAVE_DLOG

src/lxc/lxccontainer.c

@@ -25,7 +25,7 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-#include "../include/netns_ifaddrs.h"
+#include "netns_ifaddrs.h"
 #include "af_unix.h"
 #include "api_extensions.h"
 #include "attach.h"

src/lxc/monitor.c

@@ -33,7 +33,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(monitor, lxc);

src/lxc/network.c

@@ -26,7 +26,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include "../include/netns_ifaddrs.h"
+#include "netns_ifaddrs.h"
 #include "af_unix.h"
 #include "conf.h"
 #include "config.h"
@@ -42,7 +42,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(network, lxc);

src/lxc/pam/pam_cgfs.c

@@ -34,11 +34,11 @@
 #include <security/pam_modules.h>
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#include "strlcat.h"
 #endif
 
 #define pam_cgfs_debug_stream(stream, format, ...)                                \

src/lxc/rexec.c

@@ -19,7 +19,7 @@
 #include "syscall_wrappers.h"
 
 #if IS_BIONIC
-#include "../include/fexecve.h"
+#include "fexecve.h"
 #endif
 
 #define LXC_MEMFD_REXEC_SEALS \

src/lxc/start.c

@@ -63,7 +63,7 @@
 #endif
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(start, lxc);

src/lxc/storage/btrfs.c

@@ -26,11 +26,11 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#include "strlcat.h"
 #endif
 
 lxc_log_define(btrfs, lxc);

src/lxc/storage/nbd.c

@@ -22,7 +22,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(nbd, lxc);

src/lxc/storage/rbd.c

@@ -18,7 +18,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 lxc_log_define(rbd, lxc);

src/lxc/storage/storage.c

@@ -43,7 +43,7 @@
 #include "zfs.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #ifndef BLKGETSIZE64

src/lxc/storage/storage.h

@@ -9,7 +9,7 @@
 #include <lxc/lxccontainer.h>
 
 #if IS_BIONIC
-#include <../include/lxcmntent.h>
+#include "lxcmntent.h"
 #else
 #include <mntent.h>
 #endif

src/lxc/storage/storage_utils.c

@@ -31,7 +31,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #ifndef BLKGETSIZE64

src/lxc/string_utils.c

@@ -35,11 +35,11 @@
 #include "string_utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#include "strlcat.h"
 #endif
 
 char **lxc_va_arg_list_to_argv(va_list ap, size_t skip, int do_strdup)

src/lxc/string_utils.h

@@ -11,15 +11,15 @@
 #include "macro.h"
 
 #ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#include "strlcat.h"
 #endif
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #ifndef HAVE_STRCHRNUL
-#include "include/strchrnul.h"
+#include "strchrnul.h"
 #endif
 
 /* convert variadic argument lists to arrays (for execl type argument lists) */

src/lxc/terminal.c

@@ -32,7 +32,7 @@
 #if HAVE_OPENPTY
 #include <pty.h>
 #else
-#include <../include/openpty.h>
+#include "openpty.h"
 #endif
 
 #define LXC_TERMINAL_BUFFER_SIZE 1024

src/lxc/tools/include/getsubopt.c

@@ -7,7 +7,7 @@
 #include "config.h"
 
 #ifndef HAVE_STRCHRNUL
-#include "../../../include/strchrnul.h"
+#include "strchrnul.h"
 #endif
 
 /* Parse comma separated suboption from *OPTIONP and match against

src/lxc/tools/lxc_copy.c

@@ -27,7 +27,7 @@
 #include "utils.h"
 
 #ifndef HAVE_GETSUBOPT
-#include "include/getsubopt.h"
+#include "getsubopt.h"
 #endif
 
 lxc_log_define(lxc_copy, lxc);

src/lxc/tools/lxc_device.c

@@ -12,7 +12,7 @@
 
 #include <lxc/lxccontainer.h>
 
-#include "../../include/netns_ifaddrs.h"
+#include "netns_ifaddrs.h"
 #include "arguments.h"
 #include "config.h"
 #include "log.h"

src/lxc/utils.c

@@ -40,11 +40,11 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#include "strlcat.h"
 #endif
 
 #ifndef O_PATH

src/lxc/utils.h

@@ -35,7 +35,7 @@ __hidden extern char *get_rundir(void);
 /* Define getline() if missing from the C library */
 #ifndef HAVE_GETLINE
 #ifdef HAVE_FGETLN
-#include <../include/getline.h>
+#include "getline.h"
 #endif
 #endif
 

src/tests/Makefile.am

@@ -1288,6 +1288,7 @@ AM_CFLAGS += -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
 	     -DRUNTIME_PATH=\"$(RUNTIME_PATH)\" \
 	     -DSBINDIR=\"$(SBINDIR)\" \
 	     -I $(top_srcdir)/src \
+	     -I $(top_srcdir)/src/include \
 	     -I $(top_srcdir)/src/lxc \
 	     -I $(top_srcdir)/src/lxc/cgroups \
 	     -I $(top_srcdir)/src/lxc/tools \

src/tests/api_reboot.c

@@ -32,7 +32,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #define TSTNAME "lxc-api-reboot"

src/tests/arch_parse.c

@@ -31,7 +31,7 @@
 #include "../lxc/memory_utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 static const char *const arches[] = {

src/tests/attach.c

@@ -33,7 +33,7 @@
 #include <lxc/lxccontainer.h>
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #define TSTNAME    "lxc-attach-test"

src/tests/cgpath.c

@@ -36,7 +36,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #define MYNAME "lxctest1"

src/tests/device_add_remove.c

@@ -25,7 +25,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #define NAME "device_add_remove_test"

src/tests/get_item.c

@@ -32,7 +32,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #define MYNAME "lxctest1"

src/tests/shortlived.c

@@ -32,7 +32,7 @@
 #include "utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "strlcpy.h"
 #endif
 
 #define MYNAME "shortlived"