dbus: suppress duplicate message when reusing bus for system and session

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 57b8aa525c881957cfedf162c901135a039b2b93..422d37ee68843014c73ab3dfaa2ce74a27ce3b6e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -483,15 +483,18 @@ systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
        src/dbus-common.c \
        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) \
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \

-       $(DBUS_CFLAGS)
+       $(DBUS_CFLAGS) \
+       $(CGROUP_CLAGS)

 
 systemctl_LDADD = \
        libsystemd-basic.la \
 
 systemctl_LDADD = \
        libsystemd-basic.la \

-       $(DBUS_LIBS)
+       $(DBUS_LIBS) \
+       $(CGROUP_LIBS)

 
 systemd_notify_SOURCES = \
        src/notify.c \
 
 systemd_notify_SOURCES = \
        src/notify.c \


@@ -516,13 +519,16 @@ systemd_install_CFLAGS = \
 
 systemd_cgls_SOURCES = \
        src/systemd-cgls.c \
 
 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 = \
 
 systemd_cgls_CFLAGS = \

-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+       $(CGROUP_CLAGS)
+
+systemd_cgls_LDADD = \
+       libsystemd-basic.la \
+       $(CGROUP_LIBS)

 
 systemadm_SOURCES = \
        src/systemadm.vala \
 
 systemadm_SOURCES = \
        src/systemadm.vala \