]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
Makefile: remove last pam_cgfs special-casing
authorChristian Brauner <christian.brauner@ubuntu.com>
Wed, 22 Aug 2018 13:45:54 +0000 (15:45 +0200)
committerChristian Brauner <christian.brauner@ubuntu.com>
Wed, 22 Aug 2018 13:54:24 +0000 (15:54 +0200)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/Makefile.am

index 94886b23d6f76d4e80ced55b837be657b2479fad..68311a90d02d0858e26afc88023f3e5a111bacc9 100644 (file)
@@ -325,6 +325,7 @@ endif
 if ENABLE_COMMANDS
 # Binaries shipping with liblxc
 init_lxc_SOURCES = cmd/lxc_init.c \
+                  initutils.c initutils.h \
                   string_utils.c string_utils.h
 lxc_monitord_SOURCES = cmd/lxc_monitord.c
 lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \
@@ -389,8 +390,10 @@ if HAVE_PAM
 pam_LTLIBRARIES = pam_cgfs.la
 
 pam_cgfs_la_SOURCES = pam/pam_cgfs.c \
-                     macro.h \
+                     caps.c caps.h \
                      file_utils.c file_utils.h \
+                     log.c log.h \
+                     macro.h \
                      string_utils.c string_utils.h
 
 if !HAVE_STRLCAT
@@ -401,8 +404,7 @@ if !HAVE_STRLCPY
 pam_cgfs_la_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
 endif
 
-pam_cgfs_la_CFLAGS = $(AM_CFLAGS) \
-                    -DNO_LOG
+pam_cgfs_la_CFLAGS = $(AM_CFLAGS) -DNO_LXC_CONF
 
 pam_cgfs_la_LIBADD = $(AM_LIBS) \
                     $(PAM_LIBS) \