bdev: add subdirectories to search path

This allows us to avoid using relative includes which is cleaner in the long
run when we create subdirectories for other components of liblxc.

Signed-off-by: Christian Brauner <cbrauner@suse.de>

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index f361c3fcb5c5aedd251e4dfba7e6cdb548865b22..5078b5c8ada4d2a427aa9c7073ee2b6285221b22 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -138,8 +138,7 @@ liblxc_so_SOURCES += ../include/getline.c ../include/getline.h
 endif
 endif
 
-AM_CFLAGS=-I$(top_srcdir)/src \
-       -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
+AM_CFLAGS=-DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
        -DLXCPATH=\"$(LXCPATH)\" \
        -DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
        -DLXCINITDIR=\"$(LXCINITDIR)\" \
@@ -152,7 +151,10 @@ AM_CFLAGS=-I$(top_srcdir)/src \
        -DLXC_USERNIC_CONF=\"$(LXC_USERNIC_CONF)\" \
        -DDEFAULT_CGROUP_PATTERN=\"$(DEFAULT_CGROUP_PATTERN)\" \
        -DRUNTIME_PATH=\"$(RUNTIME_PATH)\" \
-       -DSBINDIR=\"$(SBINDIR)\"
+       -DSBINDIR=\"$(SBINDIR)\" \
+       -I $(top_srcdir)/src \
+       -I $(top_srcdir)/src/lxc \
+       -I $(top_srcdir)/src/lxc/bdev
 
 if ENABLE_APPARMOR
 AM_CFLAGS += -DHAVE_APPARMOR

diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c
index c493d58021c25fbb653f68eb5ff218db304ecffe..6b2ac7ee1dc2de9da77653bf223a76963ca94548 100644 (file)
--- a/src/lxc/cgfs.c
+++ b/src/lxc/cgfs.c
@@ -39,12 +39,12 @@
 #include <netinet/in.h>
 #include <net/if.h>
 
+#include "bdev.h"
 #include "error.h"
 #include "commands.h"
 #include "list.h"
 #include "conf.h"
 #include "utils.h"
-#include "bdev/bdev.h"
 #include "log.h"
 #include "cgroup.h"
 #include "start.h"

diff --git a/src/lxc/cgfsng.c b/src/lxc/cgfsng.c
index 16a94575609cc1fc844dffda05da11f3b630a701..27c2721033f0ba82249a6a1692779346f700f15e 100644 (file)
--- a/src/lxc/cgfsng.c
+++ b/src/lxc/cgfsng.c
@@ -43,11 +43,11 @@
 #include <dirent.h>
 #include <grp.h>
 
+#include "bdev.h"
 #include "log.h"
 #include "cgroup.h"
 #include "utils.h"
 #include "commands.h"
-#include "bdev/bdev.h"
 
 lxc_log_define(lxc_cgfsng, lxc);
 

diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c
index c387b00ce6004dbe40afce68728fbf00b427c9eb..4da891de90784ff8dc444e917081ec0a002bc5a4 100644 (file)
--- a/src/lxc/cgmanager.c
+++ b/src/lxc/cgmanager.c
@@ -41,12 +41,12 @@
 #include <net/if.h>
 #include <poll.h>
 
+#include "bdev.h"
 #include "error.h"
 #include "commands.h"
 #include "list.h"
 #include "conf.h"
 #include "utils.h"
-#include "bdev/bdev.h"
 #include "log.h"
 #include "cgroup.h"
 #include "start.h"

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index 1e330ac9dc2a01dcec29ec0c9b609c48b2d33150..9fea9934aa59802d5c3d5261e62bb6806665bd5d 100644 (file)
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -66,6 +66,7 @@
 #include <net/if.h>
 #include <libgen.h>
 
+#include "bdev.h"
 #include "network.h"
 #include "error.h"
 #include "af_unix.h"
@@ -74,9 +75,8 @@
 #include "conf.h"
 #include "log.h"
 #include "caps.h"       /* for lxc_caps_last_cap() */
-#include "bdev/bdev.h"
-#include "bdev/lxcaufs.h"
-#include "bdev/lxcoverlay.h"
+#include "lxcaufs.h"
+#include "lxcoverlay.h"
 #include "cgroup.h"
 #include "lxclock.h"
 #include "namespace.h"

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 645cac02d3112cf884ad88d10a884f5df797b81d..db89caaff5e5bbea65ed262d7958b77091ec451e 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -40,10 +40,10 @@
 #include <dirent.h>
 #include <syslog.h>
 
+#include "bdev.h"
 #include "parse.h"
 #include "config.h"
 #include "confile.h"
-#include "bdev/bdev.h"
 #include "utils.h"
 #include "log.h"
 #include "conf.h"

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index bf9a87adabbb2b4c9e95100a13a71cdc4c87262f..65998ed2b5a203df293793d8612b9960befcb772 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -35,7 +35,7 @@
 
 #include "config.h"
 
-#include "bdev/bdev.h"
+#include "bdev.h"
 #include "cgroup.h"
 #include "conf.h"
 #include "commands.h"

diff --git a/src/lxc/lxc_copy.c b/src/lxc/lxc_copy.c
index 69de7d5150d2b9b96a93656a59e1156f9927a61c..9f653e319333eb2b782626d81b53aa560a817e91 100644 (file)
--- a/src/lxc/lxc_copy.c
+++ b/src/lxc/lxc_copy.c
@@ -37,6 +37,7 @@
 #include <lxc/lxccontainer.h>
 
 #include "attach.h"
+#include "bdev.h"
 #include "log.h"
 #include "confile.h"
 #include "arguments.h"
@@ -44,7 +45,6 @@
 #include "conf.h"
 #include "state.h"
 #include "utils.h"
-#include "bdev/bdev.h"
 
 #ifndef HAVE_GETSUBOPT
 #include <../include/getsubopt.h>

diff --git a/src/lxc/lxc_create.c b/src/lxc/lxc_create.c
index 5fd5a296624ba8375bafca075ee6f30d968090ea..4b0e9d70f65841582104f366ce3d71610875e723 100644 (file)
--- a/src/lxc/lxc_create.c
+++ b/src/lxc/lxc_create.c
@@ -27,10 +27,10 @@
 #include <sys/types.h>
 
 #include "arguments.h"
+#include "bdev.h"
 #include "log.h"
 #include "lxc.h"
 #include "utils.h"
-#include "bdev/bdev.h"
 
 lxc_log_define(lxc_create_ui, lxc);
 

diff --git a/src/lxc/lxc_snapshot.c b/src/lxc/lxc_snapshot.c
index 147101eb466a22185c1f26caacd65a4658a3ab66..8f44891b53febb30f4c0c7f8885787978d063e9f 100644 (file)
--- a/src/lxc/lxc_snapshot.c
+++ b/src/lxc/lxc_snapshot.c
@@ -27,9 +27,9 @@
 
 #include <lxc/lxccontainer.h>
 
+#include "bdev.h"
 #include "lxc.h"
 #include "log.h"
-#include "bdev/bdev.h"
 #include "arguments.h"
 #include "utils.h"
 

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 8ea0005beb6c6489125da7b21435893dc55adbe4..24ded6f3dc0d51801214374dd3829be0e45401c4 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -39,9 +39,9 @@
 #include <sys/wait.h>
 
 #include "attach.h"
-#include "bdev/bdev.h"
-#include "bdev/lxcoverlay.h"
-#include "bdev/lxcbtrfs.h"
+#include "bdev.h"
+#include "lxcoverlay.h"
+#include "lxcbtrfs.h"
 #include "cgroup.h"
 #include "conf.h"
 #include "config.h"

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 1ba0f9bd785856696b21aa4a1e393a7f1bdbbd56..1ce9903ed80aa81e65437adc2749b3e7e7a2c973 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -55,6 +55,7 @@
 #endif
 
 #include "af_unix.h"
+#include "bdev.h"
 #include "caps.h"
 #include "cgroup.h"
 #include "commands.h"
@@ -71,7 +72,6 @@
 #include "start.h"
 #include "sync.h"
 #include "utils.h"
-#include "bdev/bdev.h"
 #include "lsm/lsm.h"
 
 lxc_log_define(lxc_start, lxc);