X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=6cc352ab91a9dd64bc5ba0e7a4b6e36b3cc69f99;hp=15f7a3485d0ff7320b45bd4d14ff5e22fa4e78c8;hb=ed061a8dc2acd93c2eb569d2d983d5a77f7e5b77;hpb=ddcbc8737873ca1904562d7d3ca3de9946e2f889

diff --git a/Makefile.am b/Makefile.am
index 15f7a3485..6cc352ab9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ LIBGUDEV_REVISION=1
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=3
+LIBSYSTEMD_LOGIN_REVISION=4
 LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -340,7 +340,8 @@ nodist_systemunit_DATA = \
 	units/user@.service \
 	units/systemd-udev.service \
 	units/systemd-udev-trigger.service \
-	units/systemd-udev-settle.service
+	units/systemd-udev-settle.service \
+	units/systemd-debug-shell.service
 
 dist_userunit_DATA = \
 	units/user/default.target \
@@ -378,6 +379,7 @@ EXTRA_DIST += \
 	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 \
 	introspect.awk \
@@ -499,6 +501,7 @@ MANPAGES = \
 	man/systemd-machine-id-setup.1 \
 	man/systemd-detect-virt.1 \
 	man/journald.conf.5 \
+	man/systemd-journald.service.8 \
 	man/journalctl.1 \
 	man/systemd-inhibit.1
 
@@ -507,13 +510,15 @@ MANPAGES_ALIAS = \
 	man/poweroff.8 \
 	man/init.1 \
 	man/systemd-modules-load.8 \
-	man/systemd-sysctl.8
+	man/systemd-sysctl.8 \
+	man/systemd-journald.8
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 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
 
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -1908,12 +1913,14 @@ TESTS += \
 	src/udev/keymap/check-keymaps.sh
 
 EXTRA_DIST += \
-	src/udev/keymap/check-keymaps.sh
+	src/udev/keymap/check-keymaps.sh \
+	src/udev/keymap/keyboard-force-release.sh.in
 
 CLEANFILES += \
 	$(nodist_keymap_SOURCES) \
 	src/udev/keymap/keys.txt \
-	src/udev/keymap/keys-from-name.gperf
+	src/udev/keymap/keys-from-name.gperf \
+	src/udev/keymap/keyboard-force-release.sh
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
@@ -2397,13 +2404,18 @@ systemd_readahead_collect_LDADD = \
 
 systemd_readahead_replay_SOURCES = \
 	src/readahead/readahead-replay.c \
-	src/readahead/readahead-common.c
+	src/readahead/readahead-common.c \
+	src/readahead/readahead-common.h
 
 systemd_readahead_replay_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
 	libudev.la
 
+systemd_readahead_analyze_SOURCES = \
+	src/readahead/readahead-analyze.c \
+	src/readahead/readahead-common.h
+
 pkginclude_HEADERS += \
 	src/systemd/sd-readahead.h
 
@@ -2411,6 +2423,9 @@ rootlibexec_PROGRAMS += \
 	systemd-readahead-collect \
 	systemd-readahead-replay
 
+bin_PROGRAMS += \
+	systemd-readahead-analyze
+
 dist_systemunit_DATA += \
 	units/systemd-readahead-drop.service \
 	units/systemd-readahead-done.timer
@@ -2915,6 +2930,7 @@ nodist_udevrules_DATA += \
 	src/login/73-seat-late.rules
 
 MANPAGES += \
+	man/systemd-logind.service.8 \
 	man/logind.conf.5 \
 	man/sd-login.7 \
 	man/loginctl.1 \
@@ -2926,6 +2942,7 @@ MANPAGES += \
 	man/sd_get_seats.3
 
 MANPAGES_ALIAS += \
+	man/systemd-logind.8 \
 	man/sd_login_monitor_unref.3 \
 	man/sd_login_monitor_flush.3 \
 	man/sd_login_monitor_get_fd.3 \
@@ -2945,6 +2962,7 @@ MANPAGES_ALIAS += \
 	man/sd_get_sessions.3 \
 	man/sd_get_uids.3
 
+man/systemd-logind.8: man/systemd-logind.service.8
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
@@ -3003,6 +3021,7 @@ SED_PROCESS = \
 		-e 's,@VERSION\@,$(VERSION),g' \
 		-e 's,@rootprefix\@,$(rootprefix),g' \
 		-e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \
+		-e 's,@sushell\@,$(sushell),g' \
 		< $< > $@ || rm $@
 
 units/%: units/%.in Makefile