X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=a028553cd3589b7c3d049d4bbe9496a18e148761;hp=7d0ca9a954fd8fb98040d7496599748c56306908;hb=f601daa70143745915a8d38603969f228414af19;hpb=e92787416c691c3f34f47349e5eae3fa68eae856

diff --git a/Makefile.am b/Makefile.am
index 7d0ca9a95..a028553cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -228,6 +228,7 @@ nodist_systemunit_DATA = \
 	units/systemd-readahead-replay.service \
 	units/systemd-readahead-done.service \
 	units/systemd-tmpfiles.service \
+	units/systemd-user-sessions.service \
 	units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -259,6 +260,7 @@ EXTRA_DIST = \
 	units/systemd-readahead-replay.service.in \
 	units/systemd-readahead-done.service.in \
 	units/systemd-tmpfiles.service.in \
+	units/systemd-user-sessions.service.in \
 	units/syslog.target.in \
 	units/session/exit.service.in \
 	systemd.pc.in
@@ -372,6 +374,7 @@ libsystemd_core_la_SOURCES = \
 	src/path.c \
 	src/load-dropin.c \
 	src/execute.c \
+	src/utmp-wtmp.c \
 	src/exit-status.c \
 	src/dbus.c \
 	src/dbus-manager.c \
@@ -399,7 +402,8 @@ libsystemd_core_la_SOURCES = \
 	src/fdset.c \
 	src/namespace.c \
 	src/tcpwrap.c \
-	src/cgroup-util.c
+	src/cgroup-util.c \
+	src/condition.c
 
 libsystemd_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -438,7 +442,6 @@ EXTRA_DIST += \
 	src/dbus-common.h \
 	src/bus-errors.h \
 	src/cgroup-show.h \
-	src/utmp-wtmp.h \
 	src/build.h \
 	src/shutdownd.h \
 	src/readahead-common.h
@@ -646,6 +649,7 @@ systemd_shutdownd_LDADD = \
 
 systemd_shutdown_SOURCES = \
 	src/mount-setup.c \
+	src/umount.h \
 	src/umount.c \
 	src/shutdown.c
 
@@ -1072,8 +1076,9 @@ install-data-hook:
 		$(LN_S) graphical.target default.target && \
 		$(LN_S) reboot.target ctrl-alt-del.target )
 	( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-		rm -f getty.target && \
-		$(LN_S) ../getty.target getty.target )
+		rm -f getty.target systemd-user-sessions.service && \
+		$(LN_S) ../getty.target getty.target && \
+		$(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
 		rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
 		$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \