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>
This commit is contained in:
Christian Brauner 2016-07-31 12:04:28 +02:00
parent b336ea596b
commit d8e4899290
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
12 changed files with 20 additions and 18 deletions

View File

@ -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

View File

@ -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"

View File

@ -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);

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -35,7 +35,7 @@
#include "config.h"
#include "bdev/bdev.h"
#include "bdev.h"
#include "cgroup.h"
#include "conf.h"
#include "commands.h"

View File

@ -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>

View File

@ -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);

View File

@ -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"

View File

@ -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"

View File

@ -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);