X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=054481426ea68a0765c9d76fe2b191d64a504c0e;hp=c3e3ad280eb23c0bf5ae1689b69bd7f4e1eae79a;hb=29f4f5118bfd958fc6d812af229535f98723dcb6;hpb=93a1d735aca5584a005d851f12cb0b8c7bb5e5ca

diff --git a/Makefile.am b/Makefile.am
index c3e3ad280..054481426 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/systemd-fsck@.service \
-	units/systemd-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,11 +369,11 @@ 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/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 \
@@ -381,8 +381,8 @@ EXTRA_DIST += \
 	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
 
@@ -488,7 +488,8 @@ MANPAGES = \
 	man/systemd-journald.service.8 \
 	man/journalctl.1 \
 	man/systemd-inhibit.1 \
-	man/systemd-remount-fs.service.8
+	man/systemd-remount-fs.service.8 \
+	man/systemd-update-utmp-runlevel.service.8
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -497,7 +498,9 @@ MANPAGES_ALIAS = \
 	man/systemd-modules-load.8 \
 	man/systemd-sysctl.8 \
 	man/systemd-journald.8 \
-	man/systemd-remount-fs.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
@@ -506,6 +509,8 @@ 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)}}}}}
@@ -898,6 +903,9 @@ EXTRA_DIST += \
 	src/core/systemd.pc.in \
 	src/core/macros.systemd.in
 
+CLEANFILES += \
+	src/core/macros.systemd
+
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
 	test-engine \
@@ -2587,6 +2595,14 @@ hostnamed-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	hostnamed-install-data-hook
 
+MANPAGES += \
+	man/systemd-hostnamed.service.8
+
+MANPAGES_ALIAS += \
+	man/systemd-hostnamed.8
+
+man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+
 EXTRA_DIST += \
 	units/systemd-hostnamed.service.in
 endif
@@ -2637,6 +2653,14 @@ localed-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	localed-install-data-hook
 
+MANPAGES += \
+	man/systemd-localed.service.8
+
+MANPAGES_ALIAS += \
+	man/systemd-localed.8
+
+man/systemd-localed.8: man/systemd-localed.service.8
+
 EXTRA_DIST += \
 	units/systemd-localed.service.in
 
@@ -2696,6 +2720,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
@@ -2941,7 +2973,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 \
@@ -2962,7 +2995,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
@@ -2983,6 +3017,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 \