X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=cf911a0fe4b818c6723d6c51869311ebbb175bd8;hb=74d29da52409ab149738ea76824679d29598e0ac;hp=3dda9b85f78ccbe009fe24d4a99bedef8d4313d5;hpb=a4023a43d0312568f0b81b39b4bc6fd9b64880eb;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 3dda9b85f..cf911a0fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -546,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 \
@@ -565,6 +569,9 @@ MANPAGES_ALIAS = \
 	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 \
@@ -609,8 +616,13 @@ 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
@@ -623,6 +635,9 @@ 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
@@ -643,14 +658,28 @@ noinst_DATA = \
 
 CLEANFILES += \
 	$(MANPAGES) \
-	$(MANPAGES_ALIAS)
+	$(MANPAGES_ALIAS) \
+	${XML_FILES:.xml=.html}
+
+if HAVE_PYTHON
+noinst_DATA += \
+	man/index.html
+
+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 $@
+endif
+
 endif
 
 EXTRA_DIST += \
 	$(XML_FILES) \
 	${XML_FILES:.xml=.html} \
 	$(MANPAGES) \
-	$(MANPAGES_ALIAS)
+	$(MANPAGES_ALIAS) \
+	make-man-index.py
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -1479,13 +1508,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 \
@@ -1723,22 +1770,10 @@ test_libudev_LDADD = \
 	libudev.la
 
 test_udev_SOURCES = \
-	src/test/test-udev.c \
-	$(libudev_core_la_SOURCES) \
-	$(libudev_private_la_SOURCES)
-
-# The test-udev program needs everything compiled with relative path
-# names for /sys, /dev, /run prefixed, pointing to our test/ directory.
-test_udev_CFLAGS = \
-	-DTEST_PREFIX=\"test\" \
-	$(libudev_core_la_CFLAGS) \
-	$(libudev_private_la_CFLAGS)
-
-test_udev_CPPFLAGS =\
-	$(libudev_core_la_CPPFLAGS)
+	src/test/test-udev.c
 
 test_udev_LDADD = \
-	libsystemd-label.la \
+	libudev-core.la \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS) \
@@ -2392,7 +2427,7 @@ noinst_PROGRAMS += \
 	test-journal-stream
 
 TESTS += \
-	test-journal
+	test-journal \
 	test-journal-match \
 	test-journal-stream
 
@@ -3179,6 +3214,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 \
@@ -3200,6 +3236,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