mirror of
https://git.proxmox.com/git/mirror_lxc
synced 2025-08-03 23:08:56 +00:00
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:
parent
b336ea596b
commit
d8e4899290
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -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"
|
||||
|
@ -35,7 +35,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include "bdev/bdev.h"
|
||||
#include "bdev.h"
|
||||
#include "cgroup.h"
|
||||
#include "conf.h"
|
||||
#include "commands.h"
|
||||
|
@ -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>
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user