update fixme

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 57b8aa525c881957cfedf162c901135a039b2b93..6351537fadf811ae84a26e92858e0173953ad0ce 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -285,14 +285,12 @@ libsystemd_core_la_SOURCES = \
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(CGROUP_CFLAGS)
+       $(UDEV_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS) \
        $(UDEV_LIBS) \
-       $(CGROUP_LIBS) \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS)
 
@@ -396,8 +394,7 @@ systemd_SOURCES = \
 systemd_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(CGROUP_CFLAGS)
+       $(UDEV_CFLAGS)
 
 systemd_LDADD = \
        libsystemd-core.la
@@ -439,12 +436,10 @@ test_cgroup_SOURCES = \
        src/cgroup-util.c
 
 test_cgroup_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CGROUP_CFLAGS)
+       $(AM_CFLAGS)
 
 test_cgroup_LDADD = \
-       libsystemd-basic.la \
-       $(CGROUP_LIBS)
+       libsystemd-basic.la
 
 systemd_logger_SOURCES = \
        src/logger.c \
@@ -483,7 +478,8 @@ systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
        src/dbus-common.c \
-       src/cgroup-show.c
+       src/cgroup-show.c \
+       src/cgroup-util.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -516,14 +512,15 @@ systemd_install_CFLAGS = \
 
 systemd_cgls_SOURCES = \
        src/systemd-cgls.c \
-       src/cgroup-show.c
-
-systemd_cgls_LDADD = \
-       libsystemd-basic.la
+       src/cgroup-show.c \
+       src/cgroup-util.c
 
 systemd_cgls_CFLAGS = \
        $(AM_CFLAGS)
 
+systemd_cgls_LDADD = \
+       libsystemd-basic.la
+
 systemadm_SOURCES = \
        src/systemadm.vala \
        src/systemd-interfaces.vala
@@ -553,8 +550,7 @@ pam_systemd_la_SOURCES = \
        src/sd-daemon.c
 
 pam_systemd_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CGROUP_CFLAGS) \
+       $(AM_CFLAGS)
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -566,8 +562,7 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
-       $(PAM_LIBS) \
-       $(CGROUP_LIBS)
+       $(PAM_LIBS)
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \