X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile-man.am;h=4d51eb420a8ff98d7aaed3d60fcf062b611afb63;hp=845f96a41295fa28494004e9ad0a660a78f88b9f;hb=538a7c37c543255dbcb21c3854191c855150fa1d;hpb=4ebadef69ff96e92122a133cfecadf60816c4fa3

diff --git a/Makefile-man.am b/Makefile-man.am
index 845f96a41..4d51eb420 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -8,226 +8,36 @@
 # attribute conditional="ENABLE_WHAT" or conditional="WITH_WHAT"
 # to <refentry> element.
 MANPAGES += \
-	man/sd-bus-errors.3 \
-	man/sd_bus_error_add_map.3 \
+	man/elogind.8 \
+	man/loginctl.1 \
+	man/logind.conf.5 \
 	man/sd_id128_get_machine.3 \
 	man/sd_id128_randomize.3 \
 	man/sd_id128_to_string.3 \
-	man/sd_is_fifo.3 \
 	man/sd_machine_get_class.3 \
 	man/sd_notify.3 \
 	man/sd_watchdog_enabled.3
 MANPAGES_ALIAS += \
-	man/SD_BUS_ERROR_ACCESS_DENIED.3 \
-	man/SD_BUS_ERROR_ADDRESS_IN_USE.3 \
-	man/SD_BUS_ERROR_AUTH_FAILED.3 \
-	man/SD_BUS_ERROR_BAD_ADDRESS.3 \
-	man/SD_BUS_ERROR_DISCONNECTED.3 \
-	man/SD_BUS_ERROR_END.3 \
-	man/SD_BUS_ERROR_FAILED.3 \
-	man/SD_BUS_ERROR_FILE_EXISTS.3 \
-	man/SD_BUS_ERROR_FILE_NOT_FOUND.3 \
-	man/SD_BUS_ERROR_INCONSISTENT_MESSAGE.3 \
-	man/SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED.3 \
-	man/SD_BUS_ERROR_INVALID_ARGS.3 \
-	man/SD_BUS_ERROR_INVALID_SIGNATURE.3 \
-	man/SD_BUS_ERROR_IO_ERROR.3 \
-	man/SD_BUS_ERROR_LIMITS_EXCEEDED.3 \
-	man/SD_BUS_ERROR_MAP.3 \
-	man/SD_BUS_ERROR_MATCH_RULE_INVALID.3 \
-	man/SD_BUS_ERROR_MATCH_RULE_NOT_FOUND.3 \
-	man/SD_BUS_ERROR_NAME_HAS_NO_OWNER.3 \
-	man/SD_BUS_ERROR_NOT_SUPPORTED.3 \
-	man/SD_BUS_ERROR_NO_MEMORY.3 \
-	man/SD_BUS_ERROR_NO_NETWORK.3 \
-	man/SD_BUS_ERROR_NO_REPLY.3 \
-	man/SD_BUS_ERROR_NO_SERVER.3 \
-	man/SD_BUS_ERROR_PROPERTY_READ_ONLY.3 \
-	man/SD_BUS_ERROR_SERVICE_UNKNOWN.3 \
-	man/SD_BUS_ERROR_TIMEOUT.3 \
-	man/SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN.3 \
-	man/SD_BUS_ERROR_UNKNOWN_INTERFACE.3 \
-	man/SD_BUS_ERROR_UNKNOWN_METHOD.3 \
-	man/SD_BUS_ERROR_UNKNOWN_OBJECT.3 \
-	man/SD_BUS_ERROR_UNKNOWN_PROPERTY.3 \
-	man/sd_bus_error_map.3 \
 	man/sd_id128_from_string.3 \
 	man/sd_id128_get_boot.3 \
-	man/sd_is_mq.3 \
-	man/sd_is_socket.3 \
-	man/sd_is_socket_inet.3 \
-	man/sd_is_socket_unix.3 \
-	man/sd_is_special.3 \
 	man/sd_machine_get_ifindices.3 \
 	man/sd_notifyf.3 \
 	man/sd_pid_notify.3 \
 	man/sd_pid_notify_with_fds.3 \
 	man/sd_pid_notifyf.3
-man/SD_BUS_ERROR_ACCESS_DENIED.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_ADDRESS_IN_USE.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_AUTH_FAILED.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_BAD_ADDRESS.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_DISCONNECTED.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_END.3: man/sd_bus_error_add_map.3
-man/SD_BUS_ERROR_FAILED.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_FILE_EXISTS.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_FILE_NOT_FOUND.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_INCONSISTENT_MESSAGE.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_INVALID_ARGS.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_INVALID_SIGNATURE.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_IO_ERROR.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_LIMITS_EXCEEDED.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_MAP.3: man/sd_bus_error_add_map.3
-man/SD_BUS_ERROR_MATCH_RULE_INVALID.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_MATCH_RULE_NOT_FOUND.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_NAME_HAS_NO_OWNER.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_NOT_SUPPORTED.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_NO_MEMORY.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_NO_NETWORK.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_NO_REPLY.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_NO_SERVER.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_PROPERTY_READ_ONLY.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_SERVICE_UNKNOWN.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_TIMEOUT.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_UNKNOWN_INTERFACE.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_UNKNOWN_METHOD.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_UNKNOWN_OBJECT.3: man/sd-bus-errors.3
-man/SD_BUS_ERROR_UNKNOWN_PROPERTY.3: man/sd-bus-errors.3
-man/sd_bus_error_map.3: man/sd_bus_error_add_map.3
 man/sd_id128_from_string.3: man/sd_id128_to_string.3
 man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
-man/sd_is_mq.3: man/sd_is_fifo.3
-man/sd_is_socket.3: man/sd_is_fifo.3
-man/sd_is_socket_inet.3: man/sd_is_fifo.3
-man/sd_is_socket_unix.3: man/sd_is_fifo.3
-man/sd_is_special.3: man/sd_is_fifo.3
 man/sd_machine_get_ifindices.3: man/sd_machine_get_class.3
 man/sd_notifyf.3: man/sd_notify.3
 man/sd_pid_notify.3: man/sd_notify.3
 man/sd_pid_notify_with_fds.3: man/sd_notify.3
 man/sd_pid_notifyf.3: man/sd_notify.3
-man/SD_BUS_ERROR_ACCESS_DENIED.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_ADDRESS_IN_USE.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_AUTH_FAILED.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_BAD_ADDRESS.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_DISCONNECTED.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_END.html: man/sd_bus_error_add_map.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_FAILED.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_FILE_EXISTS.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_FILE_NOT_FOUND.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_INCONSISTENT_MESSAGE.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_INVALID_ARGS.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_INVALID_SIGNATURE.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_IO_ERROR.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_LIMITS_EXCEEDED.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_MAP.html: man/sd_bus_error_add_map.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_MATCH_RULE_INVALID.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_MATCH_RULE_NOT_FOUND.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_NAME_HAS_NO_OWNER.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_NOT_SUPPORTED.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_NO_MEMORY.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_NO_NETWORK.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_NO_REPLY.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_NO_SERVER.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_PROPERTY_READ_ONLY.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_SERVICE_UNKNOWN.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_TIMEOUT.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_UNKNOWN_INTERFACE.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_UNKNOWN_METHOD.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_UNKNOWN_OBJECT.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/SD_BUS_ERROR_UNKNOWN_PROPERTY.html: man/sd-bus-errors.html
-	$(html-alias)
-
-man/sd_bus_error_map.html: man/sd_bus_error_add_map.html
-	$(html-alias)
-
 man/sd_id128_from_string.html: man/sd_id128_to_string.html
 	$(html-alias)
 
 man/sd_id128_get_boot.html: man/sd_id128_get_machine.html
 	$(html-alias)
 
-man/sd_is_mq.html: man/sd_is_fifo.html
-	$(html-alias)
-
-man/sd_is_socket.html: man/sd_is_fifo.html
-	$(html-alias)
-
-man/sd_is_socket_inet.html: man/sd_is_fifo.html
-	$(html-alias)
-
-man/sd_is_socket_unix.html: man/sd_is_fifo.html
-	$(html-alias)
-
-man/sd_is_special.html: man/sd_is_fifo.html
-	$(html-alias)
-
 man/sd_machine_get_ifindices.html: man/sd_machine_get_class.html
 	$(html-alias)
 
@@ -244,16 +54,6 @@ man/sd_pid_notifyf.html: man/sd_notify.html
 	$(html-alias)
 
 
-if ENABLE_LOGIND
-MANPAGES += \
-	man/elogind.conf.5 \
-	man/loginctl.1
-MANPAGES_ALIAS += \
-	#
-
-
-endif
-
 if HAVE_PAM
 MANPAGES += \
 	man/pam_elogind.8 \
@@ -363,21 +163,28 @@ man/sd_session_is_remote.html: man/sd_session_is_active.html
 
 endif
 
+if HAVE_PYTHON
+MANPAGES += \
+	man/elogind.index.7
+MANPAGES_ALIAS += \
+	#
+
+
+endif
+
 # Really, do not edit this file.
 
 EXTRA_DIST += \
-	man/elogind.conf.xml \
+	man/elogind.xml \
 	man/less-variables.xml \
 	man/libelogind-pkgconfig.xml \
 	man/loginctl.xml \
+	man/logind.conf.xml \
 	man/pam_elogind.xml \
-	man/sd-bus-errors.xml \
-	man/sd_bus_error_add_map.xml \
 	man/sd_get_seats.xml \
 	man/sd_id128_get_machine.xml \
 	man/sd_id128_randomize.xml \
 	man/sd_id128_to_string.xml \
-	man/sd_is_fifo.xml \
 	man/sd_machine_get_class.xml \
 	man/sd_notify.xml \
 	man/sd_seat_get_active.xml \