X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=a15777e36fce570c899f130beba28db994a3348b;hp=b3e9dfde811e9990572cc944ae961505f28025a6;hb=c87eba546a33ce7ecd66f0e3b61bdf55ae1389f0;hpb=4288f619215e3dda0b75113d78e4fb7ba219ed58

diff --git a/Makefile.am b/Makefile.am
index b3e9dfde8..a15777e36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,12 +71,14 @@ interface_DATA = \
 	org.freedesktop.systemd1.Unit.xml \
 	org.freedesktop.systemd1.Service.xml \
 	org.freedesktop.systemd1.Socket.xml \
+	org.freedesktop.systemd1.Timer.xml \
 	org.freedesktop.systemd1.Target.xml \
 	org.freedesktop.systemd1.Device.xml \
 	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 \
@@ -85,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 \
@@ -125,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 \
@@ -136,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
@@ -188,6 +193,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 \
@@ -196,6 +202,7 @@ COMMON_SOURCES = \
         src/dbus-job.c \
 	src/dbus-service.c \
 	src/dbus-socket.c \
+	src/dbus-timer.c \
 	src/dbus-target.c \
 	src/dbus-mount.c \
 	src/dbus-automount.c \
@@ -203,6 +210,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 \
@@ -353,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
@@ -385,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
 
@@ -512,9 +523,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 )
@@ -524,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)