From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Wed, 22 Aug 2018 13:45:54 +0000 (+0200)
Subject: Makefile: remove last pam_cgfs special-casing
X-Git-Tag: lxc-3.1.0~133^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4274ae8896474886063dc485331c3591cde52f4;p=thirdparty%2Flxc.git

Makefile: remove last pam_cgfs special-casing

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index 94886b23d..68311a90d 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -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) \