X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=00ed3016fc2e815e3159e825dfcff10fb956d450;hp=cf911a0fe4b818c6723d6c51869311ebbb175bd8;hb=6c1f3ba54ac1f42598c543b86daaf294b29294b1;hpb=6fa9a6109250d964db1f0690150b657db056ef81

diff --git a/Makefile.am b/Makefile.am
index cf911a0fe..00ed3016f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,8 +23,11 @@ AM_MAKEFLAGS = --no-print-directory
 
 SUBDIRS = . po
 
+# remove targets if the command fails
+.DELETE_ON_ERROR:
+
 LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=2
+LIBUDEV_REVISION=3
 LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
@@ -32,20 +35,20 @@ LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=2
+LIBSYSTEMD_DAEMON_REVISION=3
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=6
+LIBSYSTEMD_ID128_REVISION=7
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=2
+LIBSYSTEMD_JOURNAL_CURRENT=3
 LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=2
+LIBSYSTEMD_JOURNAL_AGE=3
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -79,7 +82,7 @@ rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
 rootlibexecdir=$(rootprefix)/lib/systemd
 
-CLEANFILES =
+CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
@@ -92,6 +95,7 @@ lib_LTLIBRARIES =
 include_HEADERS =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
+polkitpolicy_files =
 dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_man_MANS =
@@ -141,6 +145,7 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/login \
 	-I $(top_srcdir)/src/journal \
 	-I $(top_srcdir)/src/systemd \
+	-I $(top_builddir)/src/core \
 	-I $(top_srcdir)/src/core \
 	-I $(top_srcdir)/src/libudev \
 	-I $(top_srcdir)/src/udev
@@ -451,6 +456,7 @@ MANPAGES = \
 	man/systemd.device.5 \
 	man/systemd.snapshot.5 \
 	man/systemd.exec.5 \
+	man/systemd.kill.5 \
 	man/systemd.special.7 \
 	man/systemd.journal-fields.7 \
 	man/kernel-command-line.7 \
@@ -533,6 +539,7 @@ MANPAGES_ALIAS = \
 	man/systemd-poweroff.service.8 \
 	man/systemd-reboot.service.8 \
 	man/systemd-kexec.service.8 \
+	man/systemd-fsck.8 \
 	man/systemd-fsck-root.service.8 \
 	man/systemd-ask-password-console.path.8 \
 	man/systemd-ask-password-wall.service.8 \
@@ -599,6 +606,7 @@ man/systemd-shutdown.8: man/systemd-halt.service.8
 man/systemd-poweroff.service.8: man/systemd-halt.service.8
 man/systemd-reboot.service.8: man/systemd-halt.service.8
 man/systemd-kexec.service.8: man/systemd-halt.service.8
+man/systemd-fsck.8: man/systemd-fsck@.service.8
 man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
@@ -668,8 +676,12 @@ noinst_DATA += \
 CLEANFILES += \
 	man/index.html
 
-man/index.html: $(XML_FILES) $(top_srcdir)/make-man-index.py
-	$(AM_V_GEN)$(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@ || rm $@
+man/index.html: make-man-index.py $(XML_FILES)
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(PYTHON) $^ > $@
+
+EXTRA_DIST += \
+	man/index.html
 endif
 
 endif
@@ -688,6 +700,8 @@ noinst_LTLIBRARIES += \
 libsystemd_shared_la_SOURCES = \
 	src/shared/linux/auto_dev-ioctl.h \
 	src/shared/linux/fanotify.h \
+	src/shared/linux/seccomp.h \
+	src/shared/linux/seccomp-bpf.h \
 	src/shared/missing.h \
 	src/shared/list.h \
 	src/shared/macro.h \
@@ -894,6 +908,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/load-dropin.h \
 	src/core/execute.c \
 	src/core/execute.h \
+	src/core/kill.c \
+	src/core/kill.h \
 	src/core/dbus.c \
 	src/core/dbus.h \
 	src/core/dbus-manager.c \
@@ -922,6 +938,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/dbus-device.h \
 	src/core/dbus-execute.c \
 	src/core/dbus-execute.h \
+	src/core/dbus-kill.c \
+	src/core/dbus-kill.h \
 	src/core/dbus-path.c \
 	src/core/dbus-path.h \
 	src/core/cgroup.c \
@@ -961,11 +979,15 @@ libsystemd_core_la_SOURCES = \
 	src/core/switch-root.h \
 	src/core/switch-root.c \
 	src/core/killall.h \
-	src/core/killall.c
+	src/core/killall.c \
+	src/core/syscall-list.c \
+	src/core/syscall-list.h
 
 nodist_libsystemd_core_la_SOURCES = \
 	src/core/load-fragment-gperf.c \
-	src/core/load-fragment-gperf-nulstr.c
+	src/core/load-fragment-gperf-nulstr.c \
+	src/core/syscall-from-name.h \
+	src/core/syscall-to-name.h
 
 libsystemd_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -990,7 +1012,7 @@ libsystemd_core_la_LIBADD = \
 
 src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
+	$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
 EXTRA_DIST += \
 	src/core/load-fragment-gperf.gperf.m4
@@ -998,7 +1020,25 @@ EXTRA_DIST += \
 CLEANFILES += \
 	src/core/load-fragment-gperf.gperf \
 	src/core/load-fragment-gperf.c \
-	src/core/load-fragment-gperf-nulstr.c
+	src/core/load-fragment-gperf-nulstr.c \
+	src/core/syscall-list.txt \
+	src/core/syscall-from-name.gperf
+
+BUILT_SOURCES += \
+	src/core/syscall-from-name.h \
+	src/core/syscall-to-name.h
+
+src/core/syscall-list.txt: Makefile
+	$(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
+
+src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
+
+src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile
+	$(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
+
+src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile
+	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
@@ -1436,7 +1476,8 @@ systemd_nspawn_LDADD = \
 	libsystemd-label.la \
 	libsystemd-capability.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la
+	libsystemd-daemon.la \
+	libsystemd-id128-internal.la
 
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
@@ -1618,10 +1659,16 @@ libudev_private_la_LIBADD = \
 MANPAGES += \
 	man/udev.7 \
 	man/udevadm.8 \
-	man/systemd-udevd.service.8
+	man/systemd-udevd.8
 
 MANPAGES_ALIAS += \
-	man/systemd-udevd.8
+	man/systemd-udevd.service.8 \
+	man/systemd-udevd-control.socket.8 \
+	man/systemd-udevd-kernel.socket.8
+
+man/systemd-udevd.service.8: man/systemd-udevd.8
+man/systemd-udevd-control.socket.8: man/systemd-udevd.8
+man/systemd-udevd-kernel.socket.8: man/systemd-udevd.8
 
 udev-confdirs:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
@@ -1904,9 +1951,6 @@ lib_LTLIBRARIES += libgudev-1.0.la
 pkgconfiglib_DATA += \
 	src/gudev/gudev-1.0.pc
 
-EXTRA_DIST += \
-	src/gudev/gudev-1.0.pc.in
-
 CLEANFILES += \
 	src/gudev/gudev-1.0.pc
 
@@ -1957,17 +2001,6 @@ libgudev_1_0_la_LDFLAGS = \
 	-export-dynamic -no-undefined \
 	-export-symbols-regex '^g_udev_.*'
 
-EXTRA_DIST += \
-	src/gudev/gudevmarshal.list \
-	src/gudev/gudevenumtypes.h.template \
-	src/gudev/gudevenumtypes.c.template \
-	src/gudev/gjs-example.js \
-	src/gudev/seed-example-enum.js \
-	src/gudev/seed-example.js
-
-CLEANFILES += \
-	$(nodist_libgudev_1_0_la_SOURCES)
-
 src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
 	$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
@@ -2048,6 +2081,16 @@ INSTALL_EXEC_HOOKS += libgudev-install-move-hook
 UNINSTALL_EXEC_HOOKS += libgudev-uninstall-move-hook
 endif
 
+EXTRA_DIST += \
+	src/gudev/gudev-1.0.pc.in \
+	src/gudev/gudevmarshal.list \
+	src/gudev/gudevenumtypes.h.template \
+	src/gudev/gudevenumtypes.c.template \
+	src/gudev/gjs-example.js \
+	src/gudev/seed-example-enum.js \
+	src/gudev/seed-example.js
+
+
 # ------------------------------------------------------------------------------
 if ENABLE_KEYMAP
 keymap_SOURCES = \
@@ -2083,12 +2126,7 @@ dist_udevhome_SCRIPTS = \
 TESTS += \
 	src/udev/keymap/check-keymaps.sh
 
-EXTRA_DIST += \
-	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/keyboard-force-release.sh
@@ -2163,11 +2201,11 @@ dist_udevkeymapforcerel_DATA = \
 	keymaps-force-release/samsung-90x3a \
 	keymaps-force-release/common-volume-keys
 
-src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+src/udev/keymap/keys.txt: Makefile
 	$(AM_V_at)mkdir -p src/udev/keymap
-	$(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+	$(AM_V_GEN)$(CPP) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
 
-src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt
+src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
 
 src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile
@@ -2177,6 +2215,10 @@ src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
 endif
 
+EXTRA_DIST += \
+	src/udev/keymap/check-keymaps.sh \
+	src/udev/keymap/keyboard-force-release.sh.in
+
 # ------------------------------------------------------------------------------
 mtd_probe_SOURCES =  \
 	src/udev/mtd_probe/mtd_probe.c \
@@ -2508,13 +2550,13 @@ rootlibexec_PROGRAMS += \
 sysctl_DATA = \
 	sysctl.d/coredump.conf
 
-EXTRA_DIST += \
-	sysctl.d/coredump.conf.in
-
 CLEANFILES += \
 	sysctl.d/coredump.conf
 endif
 
+EXTRA_DIST += \
+	sysctl.d/coredump.conf.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_BINFMT
 systemd_binfmt_SOURCES = \
@@ -2555,10 +2597,10 @@ MANPAGES_ALIAS +=  \
 	man/systemd-binfmt.8
 
 man/systemd-binfmt.8: man/systemd-binfmt.service.8
+endif
 
 EXTRA_DIST += \
 	units/systemd-binfmt.service.in
-endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_VCONSOLE
@@ -2592,10 +2634,10 @@ MANPAGES_ALIAS += \
 	man/systemd-vconsole-setup.8
 
 man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8
+endif
 
 EXTRA_DIST += \
 	units/systemd-vconsole-setup.service.in
-endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_READAHEAD
@@ -2628,11 +2670,6 @@ nodist_systemunit_DATA += \
 	units/systemd-readahead-replay.service \
 	units/systemd-readahead-done.service
 
-EXTRA_DIST += \
-	units/systemd-readahead-collect.service.in \
-	units/systemd-readahead-replay.service.in \
-	units/systemd-readahead-done.service.in
-
 MANPAGES += \
 	man/sd_readahead.3 \
 	man/sd-readahead.3 \
@@ -2651,6 +2688,11 @@ man/systemd-readahead.8: man/systemd-readahead-replay.service.8
 
 endif
 
+EXTRA_DIST += \
+	units/systemd-readahead-collect.service.in \
+	units/systemd-readahead-replay.service.in \
+	units/systemd-readahead-done.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_QUOTACHECK
 rootlibexec_PROGRAMS += \
@@ -2659,9 +2701,6 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
 	units/systemd-quotacheck.service
 
-EXTRA_DIST += \
-	units/systemd-quotacheck.service.in
-
 systemd_quotacheck_SOURCES = \
 	src/quotacheck/quotacheck.c
 
@@ -2678,6 +2717,9 @@ man/systemd-quotacheck.8: man/systemd-quotacheck.service.8
 
 endif
 
+EXTRA_DIST += \
+	units/systemd-quotacheck.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_RANDOMSEED
 rootlibexec_PROGRAMS += \
@@ -2687,10 +2729,6 @@ nodist_systemunit_DATA += \
 	units/systemd-random-seed-save.service \
 	units/systemd-random-seed-load.service
 
-EXTRA_DIST += \
-	units/systemd-random-seed-save.service.in \
-	units/systemd-random-seed-load.service.in
-
 systemd_random_seed_SOURCES = \
 	src/random-seed/random-seed.c
 
@@ -2724,6 +2762,10 @@ man/systemd-random-seed.8: man/systemd-random-seed-load.service.8
 
 endif
 
+EXTRA_DIST += \
+	units/systemd-random-seed-save.service.in \
+	units/systemd-random-seed-load.service.in
+
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -2803,8 +2845,8 @@ dist_dbuspolicy_DATA += \
 dist_dbussystemservice_DATA += \
 	src/hostname/org.freedesktop.hostname1.service
 
-polkitpolicy_in_files += \
-	src/hostname/org.freedesktop.hostname1.policy.in
+polkitpolicy_files += \
+	src/hostname/org.freedesktop.hostname1.policy
 
 dbusinterface_DATA += \
 	org.freedesktop.hostname1.xml
@@ -2829,10 +2871,13 @@ MANPAGES_ALIAS += \
 	man/systemd-hostnamed.8
 
 man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+endif
+
+polkitpolicy_in_files += \
+	src/hostname/org.freedesktop.hostname1.policy.in
 
 EXTRA_DIST += \
 	units/systemd-hostnamed.service.in
-endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
@@ -2861,8 +2906,8 @@ dist_dbuspolicy_DATA += \
 dist_dbussystemservice_DATA += \
 	src/locale/org.freedesktop.locale1.service
 
-polkitpolicy_in_files += \
-	src/locale/org.freedesktop.locale1.policy.in
+polkitpolicy_files += \
+	src/locale/org.freedesktop.locale1.policy
 
 dbusinterface_DATA += \
 	org.freedesktop.locale1.xml
@@ -2888,9 +2933,6 @@ MANPAGES_ALIAS += \
 
 man/systemd-localed.8: man/systemd-localed.service.8
 
-EXTRA_DIST += \
-	units/systemd-localed.service.in
-
 dist_pkgdata_DATA += \
 	src/locale/kbd-model-map
 
@@ -2902,6 +2944,12 @@ update-kbd-model-map:
 
 endif
 
+polkitpolicy_in_files += \
+	src/locale/org.freedesktop.locale1.policy.in
+
+EXTRA_DIST += \
+	units/systemd-localed.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
@@ -2928,8 +2976,8 @@ dist_dbuspolicy_DATA += \
 nodist_systemunit_DATA += \
 	units/systemd-timedated.service
 
-polkitpolicy_in_files += \
-	src/timedate/org.freedesktop.timedate1.policy.in
+polkitpolicy_files += \
+	src/timedate/org.freedesktop.timedate1.policy
 
 org.freedesktop.timedate1.xml: systemd-timedated
 	$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
@@ -2940,6 +2988,9 @@ dbusinterface_DATA += \
 	org.freedesktop.timedate1.xml
 
 timedated-install-data-hook:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(prefix)/lib/ntp-units.d \
+		$(DESTDIR)$(sysconfdir)/ntp-units.d
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f dbus-org.freedesktop.timedate1.service  && \
 		$(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
@@ -2954,10 +3005,13 @@ MANPAGES_ALIAS += \
 	man/systemd-timedated.8
 
 man/systemd-timedated.8: man/systemd-timedated.service.8
+endif
+
+polkitpolicy_in_files += \
+	src/timedate/org.freedesktop.timedate1.policy.in
 
 EXTRA_DIST += \
 	units/systemd-timedated.service.in
-endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
@@ -3159,8 +3213,8 @@ noinst_LTLIBRARIES += \
 pkgconfiglib_DATA += \
 	src/login/libsystemd-login.pc
 
-polkitpolicy_in_files += \
-	src/login/org.freedesktop.login1.policy.in
+polkitpolicy_files += \
+	src/login/org.freedesktop.login1.policy
 
 logind-install-data-hook:
 	$(MKDIR_P) -m 0755 \
@@ -3210,7 +3264,6 @@ MANPAGES += \
 	man/systemd-user-sessions.service.8
 
 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 \
@@ -3218,6 +3271,7 @@ MANPAGES_ALIAS += \
 	man/sd_session_get_uid.3 \
 	man/sd_session_get_seat.3 \
 	man/sd_session_get_service.3 \
+	man/sd_session_get_state.3 \
 	man/sd_session_get_type.3 \
 	man/sd_session_get_class.3 \
 	man/sd_session_get_display.3 \
@@ -3230,6 +3284,7 @@ MANPAGES_ALIAS += \
 	man/sd_seat_can_multi_session.3 \
 	man/sd_get_sessions.3 \
 	man/sd_get_uids.3 \
+	man/systemd-logind.8 \
 	man/systemd-user-sessions.8
 
 man/systemd-logind.8: man/systemd-logind.service.8
@@ -3240,6 +3295,7 @@ man/sd_login_monitor.3: man/sd_login_monitor_new.3
 man/sd_session_get_uid.3: man/sd_session_is_active.3
 man/sd_session_get_seat.3: man/sd_session_is_active.3
 man/sd_session_get_service.3: man/sd_session_is_active.3
+man/sd_session_get_state.3: man/sd_session_is_active.3
 man/sd_session_get_type.3: man/sd_session_is_active.3
 man/sd_session_get_class.3: man/sd_session_is_active.3
 man/sd_session_get_display.3: man/sd_session_is_active.3
@@ -3254,6 +3310,15 @@ 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
 
+CLEANFILES += \
+	src/login/logind-gperf.c \
+	src/login/71-seat.rules \
+	src/login/73-seat-late.rules
+endif
+
+polkitpolicy_in_files += \
+	src/login/org.freedesktop.login1.policy.in
+
 EXTRA_DIST += \
 	src/login/logind-gperf.gperf \
 	src/login/libsystemd-login.pc.in \
@@ -3263,11 +3328,6 @@ EXTRA_DIST += \
 	units/systemd-logind.service.in \
 	units/systemd-user-sessions.service.in
 
-CLEANFILES += \
-	src/login/logind-gperf.c \
-	src/login/71-seat.rules \
-	src/login/73-seat-late.rules
-endif
 # ------------------------------------------------------------------------------
 
 SED_PROCESS = \
@@ -3293,7 +3353,7 @@ SED_PROCESS = \
 		-e 's,@rootprefix\@,$(rootprefix),g' \
 		-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
 		-e 's,@sushell\@,$(sushell),g' \
-		< $< > $@ || rm $@
+		< $< > $@
 
 units/%: units/%.in Makefile
 	$(SED_PROCESS)
@@ -3326,15 +3386,15 @@ src/%.c: src/%.gperf
 
 src/%: src/%.m4
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
+	$(M4) -P $(M4_DEFINES) < $< > $@
 
 M4_PROCESS_SYSTEM = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
+	$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 M4_PROCESS_USER = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@
+	$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 units/%: units/%.m4 Makefile
 	$(M4_PROCESS_SYSTEM)
@@ -3343,7 +3403,7 @@ units/user/%: units/%.m4 Makefile
 	$(M4_PROCESS_USER)
 
 nodist_polkitpolicy_DATA = \
-	$(polkitpolicy_in_files:.policy.in=.policy) \
+	$(polkitpolicy_files) \
 	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
 
 EXTRA_DIST += \
@@ -3390,7 +3450,7 @@ man/%.7: man/%.xml
 man/%.8: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.html: man/%.xml
+man/%.html: man/%.xml man/custom-html.xsl
 	$(XSLTPROC_PROCESS_HTML)
 
 CLEANFILES += \