dbus: add simplified way to start an arbitrary unit in a single method call

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f1f9da7a0bb6e5fdf428a2522c09fb72c88d92c9..a15777e36fce570c899f130beba28db994a3348b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -87,6 +87,7 @@ dist_systemunit_DATA = \
        units/local-fs.target \
        units/network.target \
        units/nss-lookup.target \
+       units/mail-transfer-agent.target \
        units/poweroff.target \
        units/reboot.target \
        units/remote-fs.target \
@@ -127,7 +128,8 @@ dist_sessionunit_DATA = \
        units/session/default.target
 
 sessionunit_DATA = \
-       units/session/remote-fs.target
+       units/session/remote-fs.target \
+       units/session/exit.service
 
 EXTRA_DIST = \
        units/basic.target.m4 \
@@ -138,6 +140,7 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/syslog.target.in \
+       units/session/exit.service.in \
        LICENSE \
        README \
        DISTRO_PORTING
@@ -358,6 +361,8 @@ SED_PROCESS = \
        $(SED)  -e 's,@libexecdir\@,$(libexecdir),g' \
                -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
+               -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
+               -e 's,@SYSTEMCTL\@,$(bindir)/systemctl,g' \
                < $< > $@
 
 units/%: units/%.in Makefile
@@ -390,6 +395,7 @@ CLEANFILES = \
        units/multi-user.target \
        units/remote-fs.target \
        units/session/remote-fs.target \
+       units/session/exit.service \
        man/systemd.special.7 \
        man/systemd.special.html
 
@@ -532,6 +538,14 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)/etc/init.d && \
                $(LN_S) halt reboot > /dev/null 2>&1 || true )
 endif
+if TARGET_GENTOO
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+               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 )
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir)