X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d9fb72f8e5416e574f10699d6c9a87af9b79528c;hp=b54c21b3746df1db3e94221bc123c615eac29a12;hb=216e2aded651d7861ba07b46b158134ba7f01553;hpb=4171a6676c74846c9c189f3a92b97bbcd4a11a13

diff --git a/Makefile.am b/Makefile.am
index b54c21b37..d9fb72f8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -498,12 +498,19 @@ MANPAGES = \
 	man/sd-id128.3 \
 	man/sd_id128_to_string.3 \
 	man/sd_id128_randomize.3 \
+	man/sd_id128_get_machine.3 \
 	man/sd-journal.3 \
 	man/sd_journal_print.3 \
 	man/sd_journal_stream_fd.3 \
 	man/sd_journal_open.3 \
 	man/sd_journal_next.3 \
-	man/sd_journal_get_data.3
+	man/sd_journal_get_data.3 \
+	man/sd_journal_get_realtime_usec.3 \
+	man/sd_journal_get_cutoff_realtime_usec.3 \
+	man/sd_journal_get_cursor.3 \
+	man/sd_journal_get_fd.3 \
+	man/sd_journal_add_match.3 \
+	man/sd_journal_seek_head.3
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -539,13 +546,17 @@ MANPAGES_ALIAS = \
 	man/SD_ID128_FORMAT_VAL.3 \
 	man/sd_id128_equal.3 \
 	man/sd_id128_from_string.3 \
-	man/sd_id128_get_machine.3 \
 	man/sd_id128_get_boot.3 \
 	man/sd_journal_printv.3 \
 	man/sd_journal_send.3 \
 	man/sd_journal_sendv.3 \
+	man/SD_JOURNAL_SUPPRESS_LOCATION.3 \
 	man/sd_journal_open_directory.3 \
 	man/sd_journal_close.3 \
+	man/sd_journal.3 \
+	man/SD_JOURNAL_RUNTIME_ONLY.3 \
+	man/SD_JOURNAL_SYSTEM_ONLY.3 \
+	man/SD_JOURNAL_LOCAL_ONLY.3 \
 	man/sd_journal_previous.3 \
 	man/sd_journal_next_skip.3 \
 	man/sd_journal_previous_skip.3 \
@@ -553,7 +564,20 @@ MANPAGES_ALIAS = \
 	man/SD_JOURNAL_FOREACH_BACKWARDS.3 \
 	man/sd_journal_enumerate_data.3 \
 	man/sd_journal_restart_data.3 \
-	man/SD_JOURNAL_FOREACH_DATA.3
+	man/SD_JOURNAL_FOREACH_DATA.3 \
+	man/sd_journal_get_monotonic_usec.3 \
+	man/sd_journal_get_cutoff_monotonic_usec.3 \
+	man/sd_journal_process.3 \
+	man/sd_journal_wait.3 \
+	man/SD_JOURNAL_NOP.3 \
+	man/SD_JOURNAL_APPEND.3 \
+	man/SD_JOURNAL_INVALIDATE.3 \
+	man/sd_journal_add_disjunction.3 \
+	man/sd_journal_flush_matches.3 \
+	man/sd_journal_seek_tail.3 \
+	man/sd_journal_seek_monotonic_usec.3 \
+	man/sd_journal_seek_realtime_usec.3 \
+	man/sd_journal_seek_cursor.3
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -588,13 +612,17 @@ man/SD_ID128_FORMAT_STR.3: man/sd-id128.3
 man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3
 man/sd_id128_equal.3: man/sd-id128.3
 man/sd_id128_from_string.3: man/sd_id128_to_string.3
-man/sd_id128_get_machine.3: man/sd_id128_randomize.3
-man/sd_id128_get_boot.3: man/sd_id128_randomize.3
+man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
 man/sd_journal_printv.3: man/sd_journal_print.3
 man/sd_journal_send.3: man/sd_journal_print.3
 man/sd_journal_sendv.3: man/sd_journal_print.3
+man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3
 man/sd_journal_open_directory.3: man/sd_journal_open.3
 man/sd_journal_close.3: man/sd_journal_open.3
+man/sd_journal.3: man/sd_journal_open.3
+man/SD_JOURNAL_RUNTIME_ONLY.3: man/sd_journal_open.3
+man/SD_JOURNAL_SYSTEM_ONLY.3: man/sd_journal_open.3
+man/SD_JOURNAL_LOCAL_ONLY.3: man/sd_journal_open.3
 man/sd_journal_previous.3: man/sd_journal_next.3
 man/sd_journal_next_skip.3: man/sd_journal_next.3
 man/sd_journal_previous_skip.3: man/sd_journal_next.3
@@ -603,6 +631,19 @@ man/SD_JOURNAL_FOREACH_BACKWARDS.3: man/sd_journal_next.3
 man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3
 man/sd_journal_restart_data.3: man/sd_journal_get_data.3
 man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3
+man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3
+man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3
+man/sd_journal_process.3: man/sd_journal_get_fd.3
+man/sd_journal_wait.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
+man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
+man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
+man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
+man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
+man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3
+man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3
+man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3
 
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -614,6 +655,10 @@ man_MANS = \
 
 noinst_DATA = \
 	${XML_FILES:.xml=.html}
+
+CLEANFILES += \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
 endif
 
 EXTRA_DIST += \
@@ -1449,13 +1494,31 @@ MANPAGES_ALIAS += \
 	man/sd_is_socket_unix.3 \
 	man/sd_is_socket_inet.3 \
 	man/sd_is_mq.3 \
-	man/sd_notifyf.3
+	man/sd_notifyf.3 \
+	man/SD_LISTEN_FDS_START.3 \
+	man/SD_EMERG.3 \
+	man/SD_ALERT.3 \
+	man/SD_CRIT.3 \
+	man/SD_ERR.3 \
+	man/SD_WARNING.3 \
+	man/SD_NOTICE.3 \
+	man/SD_INFO.3 \
+	man/SD_DEBUG.3
 
 man/sd_is_socket.3: man/sd_is_fifo.3
 man/sd_is_socket_unix.3: man/sd_is_fifo.3
 man/sd_is_socket_inet.3: man/sd_is_fifo.3
 man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
+man/SD_LISTEN_FDS_START.3: man/sd_listen_fds.3
+man/SD_EMERG.3: man/sd-daemon.3
+man/SD_ALERT.3: man/sd-daemon.3
+man/SD_CRIT.3: man/sd-daemon.3
+man/SD_ERR.3: man/sd-daemon.3
+man/SD_WARNING.3: man/sd-daemon.3
+man/SD_NOTICE.3: man/sd-daemon.3
+man/SD_INFO.3: man/sd-daemon.3
+man/SD_DEBUG.3: man/sd-daemon.3
 
 EXTRA_DIST += \
 	src/libsystemd-daemon/libsystemd-daemon.pc.in \
@@ -2362,7 +2425,7 @@ noinst_PROGRAMS += \
 	test-journal-stream
 
 TESTS += \
-	test-journal
+	test-journal \
 	test-journal-match \
 	test-journal-stream
 
@@ -2547,7 +2610,8 @@ systemd_readahead_LDADD = \
 	libsystemd-daemon.la \
 	libudev.la
 
-pkginclude_HEADERS += \
+dist_doc_DATA += \
+	src/readahead/sd-readahead.c \
 	src/systemd/sd-readahead.h
 
 rootlibexec_PROGRAMS += \
@@ -3148,6 +3212,7 @@ MANPAGES_ALIAS += \
 	man/sd_login_monitor_unref.3 \
 	man/sd_login_monitor_flush.3 \
 	man/sd_login_monitor_get_fd.3 \
+	man/sd_login_monitor.3 \
 	man/sd_session_get_uid.3 \
 	man/sd_session_get_seat.3 \
 	man/sd_session_get_service.3 \
@@ -3169,6 +3234,7 @@ 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
+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
@@ -3294,7 +3360,10 @@ if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
 	--nonet \
 	--stringparam man.output.quietly 1 \
-	--stringparam funcsynopsis.style ansi
+	--stringparam funcsynopsis.style ansi \
+	--stringparam man.th.extra1.suppress 1 \
+	--stringparam man.authors.section.enabled 0 \
+	--stringparam man.copyright.section.enabled 0
 
 XSLTPROC_PROCESS_MAN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \