af_unix: add lxc_unix_connect_type

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

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 6ba9ecad26b812613bfbc4a4c86501b75300af0a..4b18ac5d82831b6dfe7925c85e214d9113e1180a 100644 (file)
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -25,6 +25,7 @@ noinst_HEADERS = api_extensions.h \
                 monitor.h \
                 namespace.h \
                 raw_syscalls.h \
+                rexec.h \
                 start.h \
                 state.h \
                 storage/btrfs.h \
@@ -44,10 +45,12 @@ noinst_HEADERS = api_extensions.h \
                 ../tests/lxctest.h \
                 tools/arguments.h \
                 storage/storage_utils.h \
-                utils.h
+                utils.h \
+                uuid.h
 
 if IS_BIONIC
-noinst_HEADERS += ../include/lxcmntent.h \
+noinst_HEADERS += ../include/fexecve.h \
+                 ../include/lxcmntent.h \
                  ../include/openpty.h
 endif
 
@@ -141,11 +144,13 @@ liblxc_la_SOURCES = af_unix.c af_unix.h \
                    syscall_wrappers.h \
                    terminal.c \
                    utils.c utils.h \
+                   uuid.c uuid.h \
                    version.h \
                    $(LSM_SOURCES)
 
 if IS_BIONIC
-liblxc_la_SOURCES += ../include/lxcmntent.c ../include/lxcmntent.h \
+liblxc_la_SOURCES += ../include/fexecve.c ../include/fexecve.h \
+                    ../include/lxcmntent.c ../include/lxcmntent.h \
                     ../include/openpty.c ../include/openpty.h
 endif
 
@@ -177,6 +182,10 @@ if !HAVE_STRLCAT
 liblxc_la_SOURCES += ../include/strlcat.c ../include/strlcat.h
 endif
 
+if ENFORCE_MEMFD_REXEC
+liblxc_la_SOURCES += rexec.c rexec.h
+endif
+
 AM_CFLAGS = -DLXCROOTFSMOUNT=\"$(LXCROOTFSMOUNT)\" \
            -DLXCPATH=\"$(LXCPATH)\" \
            -DLXC_GLOBAL_CONF=\"$(LXC_GLOBAL_CONF)\" \
@@ -201,8 +210,8 @@ if ENABLE_APPARMOR
 AM_CFLAGS += -DHAVE_APPARMOR
 endif
 
-if ENABLE_GNUTLS
-AM_CFLAGS += -DHAVE_LIBGNUTLS
+if ENABLE_OPENSSL
+AM_CFLAGS += -DHAVE_OPENSSL
 endif
 
 if ENABLE_SECCOMP
@@ -228,6 +237,10 @@ liblxc_la_CFLAGS = -fPIC \
                   -DPIC \
                   $(AM_CFLAGS) \
                   -pthread
+if ENABLE_ASAN
+liblxc_la_CFLAGS += -fsanitize=address \
+                   -fno-omit-frame-pointer
+endif
 
 liblxc_la_LDFLAGS = -pthread \
                    -Wl,-no-undefined \
@@ -235,7 +248,7 @@ liblxc_la_LDFLAGS = -pthread \
                    -version-info @LXC_ABI_MAJOR@
 
 liblxc_la_LIBADD = $(CAP_LIBS) \
-                  $(GNUTLS_LIBS) \
+                  $(OPENSSL_LIBS) \
                   $(SELINUX_LIBS) \
                   $(SECCOMP_LIBS) \
                   $(DLOG_LIBS)
@@ -294,13 +307,14 @@ endif
 
 LDADD = liblxc.la \
        @CAP_LIBS@ \
-       @GNUTLS_LIBS@ \
+       @OPENSSL_LIBS@ \
        @SECCOMP_LIBS@ \
        @SELINUX_LIBS@ \
        @DLOG_LIBS@
 
 if ENABLE_TOOLS
 lxc_attach_SOURCES = tools/lxc_attach.c \
+                    rexec.c rexec.h \
                     tools/arguments.c tools/arguments.h
 lxc_autostart_SOURCES = tools/lxc_autostart.c \
                        tools/arguments.c tools/arguments.h
@@ -355,6 +369,7 @@ init_lxc_SOURCES = cmd/lxc_init.c \
                   compiler.h \
                   error.h \
                   initutils.c initutils.h \
+                  memory_utils.h \
                   parse.c parse.h \
                   raw_syscalls.c raw_syscalls.h \
                   string_utils.c string_utils.h
@@ -376,10 +391,11 @@ lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
                       syscall_wrappers.h
 lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \
                         conf.c conf.h \
+                        file_utils.c file_utils.h \
                         list.h \
                         log.c log.h \
                         macro.h \
-                        file_utils.c file_utils.h \
+                        memory_utils.h \
                         string_utils.c string_utils.h \
                         syscall_wrappers.h \
                         utils.c utils.h
@@ -403,6 +419,7 @@ init_lxc_static_SOURCES = cmd/lxc_init.c \
                          file_utils.c file_utils.h \
                          log.c log.h \
                          macro.h \
+                         memory_utils.h \
                          namespace.c namespace.h \
                          string_utils.c string_utils.h