X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3dad313347d3b21ecba2bf46af4c0bb2f2ec9091;hp=b7fb370c0e90097b589f1e59c4d907fefe3b7823;hb=83620960d6f385fcd0cf2a17f70bcb7a8e3eafa9;hpb=4aa6e7782a1b693a8e4fa1d84c87dd76fe1e536d

diff --git a/Makefile.am b/Makefile.am
index b7fb370c0..3dad31334 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -328,17 +328,17 @@ nodist_systemunit_DATA = \
 	units/systemd-ask-password-wall.service \
 	units/systemd-ask-password-console.service \
 	units/systemd-sysctl.service \
-	units/halt.service \
 	units/emergency.service \
-	units/hibernate.service \
-	units/poweroff.service \
-	units/reboot.service \
-	units/kexec.service \
-	units/fsck@.service \
-	units/fsck-root.service \
 	units/rescue.service \
-	units/suspend.service \
 	units/user@.service \
+	units/systemd-hibernate.service \
+	units/systemd-suspend.service \
+	units/systemd-halt.service \
+	units/systemd-poweroff.service \
+	units/systemd-reboot.service \
+	units/systemd-kexec.service \
+	units/systemd-fsck@.service \
+	units/systemd-fsck-root.service \
 	units/systemd-udev.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service \
@@ -349,7 +349,7 @@ dist_userunit_DATA = \
 	units/user/exit.target
 
 nodist_userunit_DATA = \
-	units/user/exit.service
+	units/user/systemd-exit.service
 
 EXTRA_DIST += \
 	units/getty@.service.m4 \
@@ -369,20 +369,20 @@ EXTRA_DIST += \
 	units/systemd-ask-password-console.service.in \
 	units/systemd-sysctl.service.in \
 	units/emergency.service.in \
-	units/halt.service.in \
-	units/poweroff.service.in \
-	units/reboot.service.in \
-	units/kexec.service.in \
-	units/user/exit.service.in \
-	units/fsck@.service.in \
-	units/fsck-root.service.in \
+	units/systemd-halt.service.in \
+	units/systemd-poweroff.service.in \
+	units/systemd-reboot.service.in \
+	units/systemd-kexec.service.in \
+	units/user/systemd-exit.service.in \
+	units/systemd-fsck@.service.in \
+	units/systemd-fsck-root.service.in \
 	units/user@.service.in \
 	units/systemd-udev.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service \
 	units/systemd-debug-shell.service.in \
-	units/hibernate.service.in \
-	units/suspend.service.in \
+	units/systemd-hibernate.service.in \
+	units/systemd-suspend.service.in \
 	introspect.awk \
 	man/custom-html.xsl
 
@@ -487,7 +487,9 @@ MANPAGES = \
 	man/journald.conf.5 \
 	man/systemd-journald.service.8 \
 	man/journalctl.1 \
-	man/systemd-inhibit.1
+	man/systemd-inhibit.1 \
+	man/systemd-remount-fs.service.8 \
+	man/systemd-update-utmp-runlevel.service.8
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -495,7 +497,10 @@ MANPAGES_ALIAS = \
 	man/init.1 \
 	man/systemd-modules-load.8 \
 	man/systemd-sysctl.8 \
-	man/systemd-journald.8
+	man/systemd-journald.8 \
+	man/systemd-remount-fs.8 \
+	man/systemd-update-utmp-shutdown.service.8 \
+	man/systemd-update-utmp.8
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -503,6 +508,9 @@ man/init.1: man/systemd.1
 man/systemd-modules-load.8: man/systemd-modules-load.service.8
 man/systemd-sysctl.8: man/systemd-sysctl.service.8
 man/systemd-journald.8: man/systemd-journald.service.8
+man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
+man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
 
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -895,6 +903,9 @@ EXTRA_DIST += \
 	src/core/systemd.pc.in \
 	src/core/macros.systemd.in
 
+CLEANFILES += \
+	src/core/macros.systemd
+
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
 	test-engine \
@@ -2439,10 +2450,10 @@ rootlibexec_PROGRAMS += \
 	systemd-quotacheck
 
 nodist_systemunit_DATA += \
-	units/quotacheck.service
+	units/systemd-quotacheck.service
 
 EXTRA_DIST += \
-	units/quotacheck.service.in
+	units/systemd-quotacheck.service.in
 
 systemd_quotacheck_SOURCES = \
 	src/quotacheck/quotacheck.c
@@ -2484,6 +2495,17 @@ randomseed-install-data-hook:
 
 INSTALL_DATA_HOOKS += \
 	randomseed-install-data-hook
+
+MANPAGES += \
+	man/systemd-random-seed-load.service.8
+
+MANPAGES_ALIAS +=  \
+	man/systemd-random-seed-save.service.8 \
+	man/systemd-random-seed.8
+
+man/systemd-random-seed-save.service.8: man/systemd-random-seed-load.service.8
+man/systemd-random-seed.8: man/systemd-random-seed-load.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2682,6 +2704,14 @@ timedated-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	timedated-install-data-hook
 
+MANPAGES += \
+	man/systemd-timedated.service.8
+
+MANPAGES_ALIAS += \
+	man/systemd-timedated.8
+
+man/systemd-timedated.8: man/systemd-timedated.service.8
+
 EXTRA_DIST += \
 	units/systemd-timedated.service.in
 endif
@@ -2927,7 +2957,8 @@ MANPAGES += \
 	man/sd_uid_get_state.3 \
 	man/sd_session_is_active.3 \
 	man/sd_seat_get_active.3 \
-	man/sd_get_seats.3
+	man/sd_get_seats.3 \
+	man/systemd-user-sessions.service.8
 
 MANPAGES_ALIAS += \
 	man/systemd-logind.8 \
@@ -2948,7 +2979,8 @@ MANPAGES_ALIAS += \
 	man/sd_seat_get_sessions.3 \
 	man/sd_seat_can_multi_session.3 \
 	man/sd_get_sessions.3 \
-	man/sd_get_uids.3
+	man/sd_get_uids.3 \
+	man/systemd-user-sessions.8
 
 man/systemd-logind.8: man/systemd-logind.service.8
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
@@ -2969,6 +3001,7 @@ man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
 man/sd_get_sessions.3: man/sd_get_seats.3
 man/sd_get_uids.3: man/sd_get_seats.3
+man/systemd-user-sessions.8: man/systemd-user-sessions.service.8
 
 EXTRA_DIST += \
 	src/login/logind-gperf.gperf \
@@ -3178,10 +3211,10 @@ systemd-install-data-hook:
 		$(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
 	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
 		rm -f systemd-remount-fs.service \
-			fsck-root.service \
+			systemd-fsck-root.service \
 			tmp.mount && \
 		$(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
-		$(LN_S) ../fsck-root.service fsck-root.service && \
+		$(LN_S) ../systemd-fsck-root.service systemd-fsck-root.service && \
 		$(LN_S) ../tmp.mount tmp.mount )
 	( cd $(DESTDIR)$(userunitdir) && \
 		rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \