cgmanager: only include CFLAGS and LDADD when needed

lxc-cgroup doesn't depend on cgmanager Signed-off-by: Dwight Engen <dwight.engen@oracle.com> Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

cgmanager: only include CFLAGS and LDADD when needed
76613030 · Dwight Engen · Stéphane Graber · e6ccd90b · 76613030
Commit 76613030 authored Feb 06, 2014 by Dwight Engen Committed by Stéphane Graber Feb 06, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 7 deletions

Makefile.am src/lxc/Makefile.am +2 -7

No files found.
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -152,10 +152,10 @@ liblxc_so_LDFLAGS = \

 liblxc_so_LDADD = $(CAP_LIBS) $(APPARMOR_LIBS) $(SECCOMP_LIBS)

-#if ENABLE_CGMANAGER
+if ENABLE_CGMANAGER
 liblxc_so_LDADD += $(CGMANAGER_LIBS) $(DBUS_LIBS) $(NIH_LIBS) $(NIH_DBUS_LIBS)
 liblxc_so_CFLAGS += $(CGMANAGER_CFLAGS) $(DBUS_CFLAGS) $(NIH_CFLAGS) $(NIH_DBUS_CFLAGS)
-#endif
+endif

 bin_SCRIPTS = lxc-checkconfig

@@ -211,11 +211,6 @@ LDADD=liblxc.so @CAP_LIBS@ @APPARMOR_LIBS@ @SECCOMP_LIBS@
 lxc_attach_SOURCES = lxc_attach.c
 lxc_autostart_SOURCES = lxc_autostart.c
 lxc_cgroup_SOURCES = lxc_cgroup.c
-#if ENABLE_CGMANAGER
-lxc_cgroup_SOURCES += cgmanager.c
-lxc_cgroup_LDADD = $(CGMANAGER_LIBS) $(DBUS_LIBS) $(NIH_LIBS) $(NIH_DBUS_LIBS) $(LDADD)
-lxc_cgroup_CFLAGS = $(CGMANAGER_CFLAGS) $(DBUS_CFLAGS) $(NIH_CFLAGS) $(NIH_DBUS_CFLAGS)
-#endif
 lxc_config_SOURCES = lxc_config.c
 lxc_console_SOURCES = lxc_console.c
 lxc_destroy_SOURCES = lxc_destroy.c