Revert "Revert "cgfsng: avoid tiny race window""

[mirror_lxc.git] / src / lxc / Makefile.am

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 0322a0d651c6fb135a4ea30e7563939f0e52190f..2011a6c021f34627738e279529df7d39594230df 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -2,16 +2,19 @@ pkginclude_HEADERS = attach_options.h \
                     lxccontainer.h \
                     version.h
 
-noinst_HEADERS = attach.h \
+noinst_HEADERS = api_extensions.h \
+                attach.h \
                 caps.h \
                 cgroups/cgroup.h \
                 cgroups/cgroup_utils.h \
+                compiler.h \
                 conf.h \
                 confile.h \
                 confile_utils.h \
                 criu.h \
                 error.h \
                 file_utils.h \
+                ../include/netns_ifaddrs.h \
                 initutils.h \
                 list.h \
                 log.h \
@@ -20,6 +23,7 @@ noinst_HEADERS = attach.h \
                 macro.h \
                 monitor.h \
                 namespace.h \
+                raw_syscalls.h \
                 start.h \
                 state.h \
                 storage/btrfs.h \
@@ -34,14 +38,14 @@ noinst_HEADERS = attach.h \
                 storage/storage_utils.h \
                 storage/zfs.h \
                 string_utils.h \
+                syscall_wrappers.h \
                 terminal.h \
                 ../tests/lxctest.h \
                 tools/arguments.h \
                 utils.h
 
 if IS_BIONIC
-noinst_HEADERS += ../include/ifaddrs.h \
-                 ../include/lxcmntent.h \
+noinst_HEADERS += ../include/lxcmntent.h \
                  ../include/openpty.h
 endif
 
@@ -81,11 +85,13 @@ endif
 
 lib_LTLIBRARIES = liblxc.la
 liblxc_la_SOURCES = af_unix.c af_unix.h \
+                   api_extensions.h \
                    attach.c attach.h \
                    caps.c caps.h \
                    cgroups/cgfsng.c \
                    cgroups/cgroup.c cgroups/cgroup.h \
                    cgroups/cgroup_utils.c cgroups/cgroup_utils.h \
+                   compiler.h \
                    commands.c commands.h \
                    commands_utils.c commands_utils.h \
                    conf.c conf.h \
@@ -96,6 +102,7 @@ liblxc_la_SOURCES = af_unix.c af_unix.h \
                    execute.c \
                    freezer.c \
                    file_utils.c file_utils.h \
+                   ../include/netns_ifaddrs.c ../include/netns_ifaddrs.h \
                    initutils.c initutils.h \
                    list.h \
                    log.c log.h \
@@ -110,6 +117,7 @@ liblxc_la_SOURCES = af_unix.c af_unix.h \
                    network.c network.h \
                    monitor.c monitor.h \
                    parse.c parse.h \
+                   raw_syscalls.c raw_syscalls.h \
                    ringbuf.c ringbuf.h \
                    rtnl.c rtnl.h \
                    state.c state.h \
@@ -127,15 +135,12 @@ liblxc_la_SOURCES = af_unix.c af_unix.h \
                    storage/zfs.c storage/zfs.h \
                    string_utils.c string_utils.h \
                    sync.c sync.h \
+                   syscall_wrappers.h \
                    terminal.c \
                    utils.c utils.h \
                    version.h \
                    $(LSM_SOURCES)
 
-if !HAVE_IFADDRS_H
-liblxc_la_SOURCES += ../include/ifaddrs.c ../include/ifaddrs.h
-endif
-
 if IS_BIONIC
 liblxc_la_SOURCES += ../include/lxcmntent.c ../include/lxcmntent.h \
                     ../include/openpty.c ../include/openpty.h
@@ -206,6 +211,11 @@ if ENABLE_SELINUX
 AM_CFLAGS += -DHAVE_SELINUX
 endif
 
+if ENABLE_DLOG
+AM_CFLAGS += -DHAVE_DLOG \
+             $(DLOG_CFLAGS)
+endif
+
 if USE_CONFIGPATH_LOGS
 AM_CFLAGS += -DUSE_CONFIGPATH_LOGS
 endif
@@ -224,7 +234,8 @@ liblxc_la_LDFLAGS = -pthread \
 liblxc_la_LIBADD = $(CAP_LIBS) \
                   $(GNUTLS_LIBS) \
                   $(SELINUX_LIBS) \
-                  $(SECCOMP_LIBS)
+                  $(SECCOMP_LIBS) \
+                  $(DLOG_LIBS)
 
 bin_SCRIPTS=
 
@@ -276,7 +287,8 @@ LDADD = liblxc.la \
        @CAP_LIBS@ \
        @GNUTLS_LIBS@ \
        @SECCOMP_LIBS@ \
-       @SELINUX_LIBS@
+       @SELINUX_LIBS@ \
+       @DLOG_LIBS@
 
 if ENABLE_TOOLS
 lxc_attach_SOURCES = tools/lxc_attach.c \
@@ -300,6 +312,7 @@ lxc_freeze_SOURCES = tools/lxc_freeze.c \
 lxc_info_SOURCES = tools/lxc_info.c \
                   tools/arguments.c tools/arguments.h
 lxc_monitor_SOURCES = tools/lxc_monitor.c \
+                     macro.h \
                      tools/arguments.c tools/arguments.h
 lxc_ls_SOURCES = tools/lxc_ls.c \
                 tools/arguments.c tools/arguments.h
@@ -328,20 +341,31 @@ endif
 if ENABLE_COMMANDS
 # Binaries shipping with liblxc
 init_lxc_SOURCES = cmd/lxc_init.c \
+                  compiler.h \
+                  error.h \
                   initutils.c initutils.h \
+                  log.c log.h \
+                  parse.c parse.h \
+                  raw_syscalls.c raw_syscalls.h \
                   string_utils.c string_utils.h
-lxc_monitord_SOURCES = cmd/lxc_monitord.c
+lxc_monitord_SOURCES = cmd/lxc_monitord.c \
+                      af_unix.c af_unix.h \
+                      log.c log.h \
+                      mainloop.c mainloop.h \
+                      monitor.c monitor.h \
+                      raw_syscalls.c raw_syscalls.h \
+                      utils.c utils.h
 lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
+                      ../include/netns_ifaddrs.c ../include/netns_ifaddrs.h \
                       log.c log.h \
-                      namespace.c namespace.h \
                       network.c network.h \
-                      parse.c parse.h
+                      parse.c parse.h \
+                      raw_syscalls.c raw_syscalls.h
 lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
                         conf.c conf.h \
                         list.h \
                         log.c log.h \
                         macro.h \
-                        namespace.c namespace.h \
                         file_utils.c file_utils.h \
                         string_utils.c string_utils.h \
                         utils.c utils.h
@@ -411,6 +435,7 @@ pam_cgfs_la_CFLAGS = $(AM_CFLAGS) -DNO_LXC_CONF
 
 pam_cgfs_la_LIBADD = $(AM_LIBS) \
                     $(PAM_LIBS) \
+                    $(DLOG_LIBS) \
                     -L$(top_srcdir)
 
 pam_cgfs_la_LDFLAGS = $(AM_LDFLAGS) \