service: fix minor memory leak

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 115197e6c736fc3592256826d899a66f69d107cb..422d37ee68843014c73ab3dfaa2ce74a27ce3b6e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -126,9 +126,11 @@ dist_systemunit_DATA = \
        units/rpcbind.target \
        units/rtc-set.target \
        units/shutdown.target \
+       units/umount.target \
        units/sigpwr.target \
        units/sockets.target \
        units/swap.target \
+       units/dbus.target \
        units/systemd-initctl.socket \
        units/systemd-logger.socket \
        units/dev-hugepages.automount \
@@ -152,8 +154,7 @@ nodist_systemunit_DATA = \
        units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
-       units/syslog.target \
-       units/dbus.target
+       units/syslog.target
 
 dist_sessionunit_DATA = \
        units/session/default.target
@@ -171,7 +172,6 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/syslog.target.in \
-       units/dbus.target.in \
        units/session/exit.service.in \
        systemd.pc.in
 
@@ -483,15 +483,18 @@ 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) \
-       $(DBUS_CFLAGS)
+       $(DBUS_CFLAGS) \
+       $(CGROUP_CLAGS)
 
 systemctl_LDADD = \
        libsystemd-basic.la \
-       $(DBUS_LIBS)
+       $(DBUS_LIBS) \
+       $(CGROUP_LIBS)
 
 systemd_notify_SOURCES = \
        src/notify.c \
@@ -516,13 +519,16 @@ 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)
+       $(AM_CFLAGS) \
+       $(CGROUP_CLAGS)
+
+systemd_cgls_LDADD = \
+       libsystemd-basic.la \
+       $(CGROUP_LIBS)
 
 systemadm_SOURCES = \
        src/systemadm.vala \
@@ -573,7 +579,6 @@ SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
                -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-               -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \