X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile-man.am;h=e3c43b269badce5680cb7b1ba183b278df551377;hp=906a96895441405ad649aa71fced72095506d36c;hb=75e52a16f9ef476f1d18ec6d9c84e00149b80d03;hpb=02b75c9edd61f47de7940b61b97b071b69f38a11

diff --git a/Makefile-man.am b/Makefile-man.am
index 906a96895..e3c43b269 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -148,6 +148,7 @@ MANPAGES_ALIAS += \
 	man/SD_NOTICE.3 \
 	man/SD_WARNING.3 \
 	man/init.1 \
+	man/journald.conf.d.5 \
 	man/poweroff.8 \
 	man/reboot.8 \
 	man/sd_id128_equal.3 \
@@ -195,6 +196,8 @@ MANPAGES_ALIAS += \
 	man/sd_journal_wait.3 \
 	man/sd_machine_get_ifindices.3 \
 	man/sd_notifyf.3 \
+	man/sleep.conf.d.5 \
+	man/system.conf.d.5 \
 	man/systemd-ask-password-console.path.8 \
 	man/systemd-ask-password-wall.path.8 \
 	man/systemd-ask-password-wall.service.8 \
@@ -227,7 +230,8 @@ MANPAGES_ALIAS += \
 	man/systemd-udevd-kernel.socket.8 \
 	man/systemd-udevd.8 \
 	man/systemd-update-done.8 \
-	man/systemd-user.conf.5
+	man/systemd-user.conf.5 \
+	man/user.conf.d.5
 man/SD_ALERT.3: man/sd-daemon.3
 man/SD_CRIT.3: man/sd-daemon.3
 man/SD_DEBUG.3: man/sd-daemon.3
@@ -254,6 +258,7 @@ man/SD_LISTEN_FDS_START.3: man/sd_listen_fds.3
 man/SD_NOTICE.3: man/sd-daemon.3
 man/SD_WARNING.3: man/sd-daemon.3
 man/init.1: man/systemd.1
+man/journald.conf.d.5: man/journald.conf.5
 man/poweroff.8: man/halt.8
 man/reboot.8: man/halt.8
 man/sd_id128_equal.3: man/sd-id128.3
@@ -301,6 +306,8 @@ man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3
 man/sd_journal_wait.3: man/sd_journal_get_fd.3
 man/sd_machine_get_ifindices.3: man/sd_machine_get_class.3
 man/sd_notifyf.3: man/sd_notify.3
+man/sleep.conf.d.5: man/systemd-sleep.conf.5
+man/system.conf.d.5: man/systemd-system.conf.5
 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
@@ -334,6 +341,7 @@ man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
 man/systemd-udevd.8: man/systemd-udevd.service.8
 man/systemd-update-done.8: man/systemd-update-done.service.8
 man/systemd-user.conf.5: man/systemd-system.conf.5
+man/user.conf.d.5: man/systemd-system.conf.5
 man/SD_ALERT.html: man/sd-daemon.html
 	$(html-alias)
 
@@ -412,6 +420,9 @@ man/SD_WARNING.html: man/sd-daemon.html
 man/init.html: man/systemd.html
 	$(html-alias)
 
+man/journald.conf.d.html: man/journald.conf.html
+	$(html-alias)
+
 man/poweroff.html: man/halt.html
 	$(html-alias)
 
@@ -553,6 +564,12 @@ man/sd_machine_get_ifindices.html: man/sd_machine_get_class.html
 man/sd_notifyf.html: man/sd_notify.html
 	$(html-alias)
 
+man/sleep.conf.d.html: man/systemd-sleep.conf.html
+	$(html-alias)
+
+man/system.conf.d.html: man/systemd-system.conf.html
+	$(html-alias)
+
 man/systemd-ask-password-console.path.html: man/systemd-ask-password-console.service.html
 	$(html-alias)
 
@@ -652,6 +669,9 @@ man/systemd-update-done.html: man/systemd-update-done.service.html
 man/systemd-user.conf.html: man/systemd-system.conf.html
 	$(html-alias)
 
+man/user.conf.d.html: man/systemd-system.conf.html
+	$(html-alias)
+
 
 if ENABLE_BACKLIGHT
 MANPAGES += \
@@ -681,8 +701,10 @@ MANPAGES += \
 	man/bootchart.conf.5 \
 	man/systemd-bootchart.1
 MANPAGES_ALIAS += \
-	#
-
+	man/bootchart.conf.d.5
+man/bootchart.conf.d.5: man/bootchart.conf.5
+man/bootchart.conf.d.html: man/bootchart.conf.html
+	$(html-alias)
 
 endif
 
@@ -692,8 +714,10 @@ MANPAGES += \
 	man/coredumpctl.1 \
 	man/systemd-coredump.8
 MANPAGES_ALIAS += \
-	#
-
+	man/coredump.conf.d.5
+man/coredump.conf.d.5: man/coredump.conf.5
+man/coredump.conf.d.html: man/coredump.conf.html
+	$(html-alias)
 
 endif
 
@@ -1180,8 +1204,13 @@ MANPAGES += \
 	man/resolved.conf.5 \
 	man/systemd-resolved.service.8
 MANPAGES_ALIAS += \
+	man/resolved.conf.d.5 \
 	man/systemd-resolved.8
+man/resolved.conf.d.5: man/resolved.conf.5
 man/systemd-resolved.8: man/systemd-resolved.service.8
+man/resolved.conf.d.html: man/resolved.conf.html
+	$(html-alias)
+
 man/systemd-resolved.html: man/systemd-resolved.service.html
 	$(html-alias)
 
@@ -1215,11 +1244,16 @@ MANPAGES += \
 	man/systemd-timesyncd.service.8 \
 	man/timesyncd.conf.5
 MANPAGES_ALIAS += \
-	man/systemd-timesyncd.8
+	man/systemd-timesyncd.8 \
+	man/timesyncd.conf.d.5
 man/systemd-timesyncd.8: man/systemd-timesyncd.service.8
+man/timesyncd.conf.d.5: man/timesyncd.conf.5
 man/systemd-timesyncd.html: man/systemd-timesyncd.service.html
 	$(html-alias)
 
+man/timesyncd.conf.d.html: man/timesyncd.conf.html
+	$(html-alias)
+
 endif
 
 if ENABLE_VCONSOLE
@@ -1638,6 +1672,7 @@ EXTRA_DIST += \
 	man/sd_uid_get_state.xml \
 	man/sd_watchdog_enabled.xml \
 	man/shutdown.xml \
+	man/standard-conf.xml \
 	man/standard-options.xml \
 	man/sysctl.d.xml \
 	man/systemctl.xml \