systemctl: fix parsing of cgroup contents

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 766ea92a16622faa59a991618ee83541222b5b99..435f00d663de5cdb08386e2d8b3fd7b064c97fc9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -146,7 +146,8 @@ nodist_systemunit_DATA = \
        units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
-       units/syslog.target
+       units/syslog.target \
+       units/dbus.target
 
 dist_sessionunit_DATA = \
        units/session/default.target
@@ -164,6 +165,7 @@ 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
 
@@ -217,10 +219,6 @@ noinst_LTLIBRARIES = \
        libsystemd-basic.la \
        libsystemd-core.la
 
-# This is needed because automake is buggy in how it generates the
-# rules for C programs, but not Vala programs.  We therefore can't
-# list the .h files as dependencies if we want make dist to work.
-
 libsystemd_basic_la_SOURCES = \
         src/util.c \
         src/hashmap.c \
@@ -291,6 +289,10 @@ libsystemd_core_la_LIBADD = \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS)
 
+# This is needed because automake is buggy in how it generates the
+# rules for C programs, but not Vala programs.  We therefore can't
+# list the .h files as dependencies if we want make dist to work.
+
 EXTRA_DIST += \
        ${libsystemd_basic_la_SOURCES:.c=.h} \
        ${libsystemd_core_la_SOURCES:.c=.h} \
@@ -302,8 +304,8 @@ EXTRA_DIST += \
        src/linux/auto_dev-ioctl.h \
        src/initreq.h \
        src/sd-daemon.h \
-       src/special.h
-
+       src/special.h \
+       src/dbus.common.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -324,6 +326,9 @@ MANPAGES = \
        man/systemd.timer.5 \
        man/systemd.path.5 \
        man/systemd.target.5 \
+       man/systemd.device.5 \
+       man/systemd.snapshot.5 \
+       man/systemd.exec.5 \
        man/daemon.7 \
        man/sd-daemon.7 \
        man/runlevel.8 \
@@ -464,7 +469,8 @@ systemd_cgroups_agent_LDADD = \
 
 systemctl_SOURCES = \
        src/systemctl.c \
-       src/utmp-wtmp.c
+       src/utmp-wtmp.c \
+       src/dbus-common.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -483,12 +489,13 @@ systemd_notify_LDADD = \
 
 systemd_install_SOURCES = \
        src/install.c \
-       src/path-lookup.c
+       src/path-lookup.c \
+       src/dbus-common.c
 
 systemd_install_LDADD = \
-       libsystemd-basic.la
+       libsystemd-basic.la \
+       $(DBUS_LIBS)
 
-# We don't really link here against D-Bus, however we indirectly include D-Bus header files
 systemd_install_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
@@ -735,8 +742,8 @@ if TARGET_FEDORA
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) ../display-manager.service display-manager.service )
+               rm -f prefdm.service && \
+               $(LN_S) ../prefdm.service prefdm.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f rc-local.service && \
                $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
@@ -751,8 +758,8 @@ if TARGET_GENTOO
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/xdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) ../display-manager.service display-manager.service )
+               rm -f prefdm.service && \
+               $(LN_S) ../prefdm.service prefdm.service )
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \