X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=f129525f2e944ddfb31283e24f92bb87d4c25c8a;hb=6f3f9deb0b63242de8240b38ffe4d9a2a0b95956;hp=4307db1a69e377e498a713f49b218cf95ac54c9e;hpb=71fad6751434f06485a744d41be2d807303c1184;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 4307db1a6..f129525f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ tmpfilesdir=$(sysconfdir)/tmpfiles.d
 # And these are the special ones for /
 rootdir=@rootdir@
 rootbindir=$(rootdir)/bin
+rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
 systemunitdir=$(rootdir)/lib/systemd/system
 
@@ -50,9 +51,11 @@ AM_CPPFLAGS = \
 	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
 	-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
 	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+	-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
 	-DRUNTIME_DIR=\"$(localstatedir)/run\" \
 	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
+	-DKEXEC_BINARY_PATH=\"$(rootsbindir)/kexec\" \
 	-I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -61,11 +64,18 @@ AM_CPPFLAGS += \
 	-DKBD_SETFONT=\"/usr/bin/setfont\" \
 	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_ARCH
+AM_CPPFLAGS += \
+	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+	-DKBD_SETFONT=\"/usr/bin/setfont\" \
+	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
 	-DKBD_SETFONT=\"/bin/setfont\" \
 	-DDEFAULT_FONT=\"latarcyrheb-sun16\"
 endif
+endif
 
 rootbin_PROGRAMS = \
 	systemd \
@@ -89,6 +99,7 @@ rootlibexec_PROGRAMS = \
 	systemd-update-utmp \
 	systemd-random-seed \
 	systemd-shutdownd \
+	systemd-shutdown \
 	systemd-modules-load \
 	systemd-remount-api-vfs \
 	systemd-kmsg-syslogd \
@@ -96,7 +107,8 @@ rootlibexec_PROGRAMS = \
 	systemd-reply-password \
 	systemd-readahead-collect \
 	systemd-readahead-replay \
-	systemd-tmpfiles
+	systemd-tmpfiles \
+	systemd-user-sessions
 
 noinst_PROGRAMS = \
 	test-engine \
@@ -150,6 +162,7 @@ dist_systemunit_DATA = \
 	units/basic.target \
 	units/getty.target \
 	units/halt.target \
+	units/kexec.target \
 	units/local-fs.target \
 	units/network.target \
 	units/nss-lookup.target \
@@ -161,6 +174,7 @@ dist_systemunit_DATA = \
 	units/rpcbind.target \
 	units/rtc-set.target \
 	units/shutdown.target \
+	units/final.target \
 	units/umount.target \
 	units/sigpwr.target \
 	units/sockets.target \
@@ -216,10 +230,16 @@ nodist_systemunit_DATA = \
 	units/systemd-readahead-replay.service \
 	units/systemd-readahead-done.service \
 	units/systemd-tmpfiles.service \
-	units/syslog.target
+	units/systemd-user-sessions.service \
+	units/syslog.target \
+	units/halt.service \
+	units/poweroff.service \
+	units/reboot.service \
+	units/kexec.service
 
 dist_sessionunit_DATA = \
-	units/session/default.target
+	units/session/default.target \
+	units/session/exit.target
 
 nodist_sessionunit_DATA = \
 	units/session/remote-fs.target \
@@ -247,18 +267,20 @@ 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/halt.service.in \
+	units/poweroff.service.in \
+	units/reboot.service.in \
+	units/kexec.service.in \
 	units/session/exit.service.in \
 	systemd.pc.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
-	units/fedora/halt.service \
-	units/fedora/killall.service \
-	units/fedora/poweroff.service \
 	units/fedora/prefdm.service \
 	units/fedora/rc-local.service \
-	units/fedora/reboot.service \
+	units/fedora/halt-local.service \
 	units/fedora/sysinit.service \
 	units/fedora/single.service \
 	units/fedora/plymouth-quit.service \
@@ -269,10 +291,6 @@ endif
 
 if TARGET_DEBIAN
 dist_systemunit_DATA += \
-	units/debian/halt.service \
-	units/debian/killall.service \
-	units/debian/poweroff.service \
-	units/debian/reboot.service \
 	units/debian/fsck.target \
 	units/debian/umountfs.service \
 	units/debian/umountnfs.service \
@@ -281,28 +299,18 @@ endif
 
 if TARGET_SUSE
 dist_systemunit_DATA += \
-	units/suse/halt.service \
-	units/suse/poweroff.service \
-	units/suse/reboot.service \
 	units/suse/fsck.target
 endif
 
 if TARGET_GENTOO
 dist_systemunit_DATA += \
-	units/gentoo/halt.service \
-	units/gentoo/killall.service \
-	units/gentoo/poweroff.service \
-	units/gentoo/reboot.service \
 	units/gentoo/xdm.service
 endif
 
 if TARGET_ARCH
 dist_systemunit_DATA += \
 	units/arch/sysinit.service \
-	units/arch/rc-local.service \
-	units/arch/halt.service \
-	units/arch/poweroff.service \
-	units/arch/reboot.service
+	units/arch/rc-local.service
 endif
 
 dist_doc_DATA = \
@@ -360,6 +368,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 \
@@ -387,7 +396,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) \
@@ -426,9 +436,9 @@ 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/umount.h \
 	src/readahead-common.h
 
 MANPAGES = \
@@ -632,6 +642,19 @@ systemd_shutdownd_CFLAGS = \
 systemd_shutdownd_LDADD = \
 	libsystemd-basic.la
 
+systemd_shutdown_SOURCES = \
+	src/mount-setup.c \
+	src/umount.c \
+	src/shutdown.c
+
+systemd_shutdown_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(UDEV_CFLAGS)
+
+systemd_shutdown_LDADD = \
+	libsystemd-basic.la \
+	$(UDEV_LIBS)
+
 systemd_modules_load_SOURCES = \
 	src/modules-load.c
 
@@ -647,6 +670,16 @@ systemd_tmpfiles_SOURCES = \
 systemd_tmpfiles_CFLAGS = \
 	$(AM_CFLAGS)
 
+systemd_user_sessions_LDADD = \
+	libsystemd-basic.la
+
+systemd_user_sessions_SOURCES = \
+	src/user-sessions.c \
+	src/cgroup-util.c
+
+systemd_user_sessions_CFLAGS = \
+	$(AM_CFLAGS)
+
 systemd_modules_load_LDADD = \
 	libsystemd-basic.la
 
@@ -1037,8 +1070,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 && \
@@ -1085,7 +1119,8 @@ if TARGET_FEDORA
 		$(DESTDIR)$(systemunitdir)/poweroff.target.wants \
 		$(DESTDIR)$(systemunitdir)/halt.target.wants \
 		$(DESTDIR)$(systemunitdir)/rescue.target.wants \
-		$(DESTDIR)$(systemunitdir)/multi-user.target.wants
+		$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+		$(DESTDIR)$(systemunitdir)/final.target.wants
 	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@@ -1095,6 +1130,9 @@ if TARGET_FEDORA
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
 		rm -f rc-local.service && \
 		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+	( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+		rm -f halt-local.service && \
+		$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
 	( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
 		rm -f single.service && \
 		$(LN_S) $(systemunitdir)/single.service single.service )