units: drop fuse fs from automount, since this is now done by udev internally

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b404bbedff464cb876cbe199f15aa78c9349471e..96e145b31d509de2c8b65e9e398595f215fe7b21 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,8 @@ interface_DATA = \
        org.freedesktop.systemd1.Mount.xml \
        org.freedesktop.systemd1.Automount.xml \
        org.freedesktop.systemd1.Snapshot.xml \
-       org.freedesktop.systemd1.Swap.xml
+       org.freedesktop.systemd1.Swap.xml \
+       org.freedesktop.systemd1.Path.xml
 
 dist_systemunit_DATA = \
        units/emergency.service \
@@ -86,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 \
@@ -104,8 +106,6 @@ dist_systemunit_DATA = \
        units/dev-mqueue.mount \
        units/proc-sys-fs-binfmt_misc.automount \
        units/proc-sys-fs-binfmt_misc.mount \
-       units/sys-fs-fuse-connections.automount \
-       units/sys-fs-fuse-connections.mount \
        units/sys-kernel-debug.automount \
        units/sys-kernel-debug.mount \
        units/sys-kernel-security.automount \
@@ -126,7 +126,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 \
@@ -137,6 +138,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
@@ -189,6 +191,7 @@ COMMON_SOURCES = \
         src/snapshot.c \
         src/socket.c \
         src/timer.c \
+       src/path.c \
         src/load-dropin.c \
         src/execute.c \
         src/dbus.c \
@@ -205,6 +208,7 @@ COMMON_SOURCES = \
        src/dbus-snapshot.c \
        src/dbus-device.c \
        src/dbus-execute.c \
+       src/dbus-path.c \
        src/cgroup.c \
        src/mount-setup.c \
        src/hostname-setup.c \
@@ -355,6 +359,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
@@ -387,6 +393,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
 
@@ -514,9 +521,12 @@ install-data-hook:
                $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
                $(LN_S) ../sys-fs-fuse-connections.automount sys-fs-fuse-connections.automount )
 if TARGET_FEDORA
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+               rm -f display-manager.service && \
+               $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f prefdm.service && \
-               $(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
+               rm -f display-manager.service && \
+               $(LN_S) ../display-manager.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f rc-local.service && \
                $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
@@ -526,6 +536,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)