X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=50b2a9f36380459e2a30be3e37467ed67bb34925;hp=a06b0ca6a8cbd83b8eadddca8565c420ff65db77;hb=4a010f4e6e95964d7acaa33be768dbdb5e46d72a;hpb=cb07866b1b7c11e687a322d70dd9f9d73bbbe488

diff --git a/Makefile.am b/Makefile.am
index a06b0ca6a..50b2a9f36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -499,7 +499,14 @@ MANPAGES = \
 	man/sd_id128_to_string.3 \
 	man/sd_id128_randomize.3 \
 	man/sd-journal.3 \
-	man/sd_journal_print.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_realtime_usec.3 \
+	man/sd_journal_get_cutoff_realtime_usec.3 \
+	man/sd_journal_get_cursor.3
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -529,17 +536,29 @@ MANPAGES_ALIAS = \
 	man/systemd-tmpfiles-setup.service.8 \
 	man/systemd-tmpfiles-clean.service.8 \
 	man/systemd-tmpfiles-clean.timer.8 \
-	man/sd_id128_t.7 \
-	man/SD_ID128_MAKE.7 \
-	man/SD_ID128_FORMAT_STR.7 \
-	man/SD_ID128_FORMAT_VAL.7 \
-	man/sd_id128_equal.7 \
+	man/sd_id128_t.3 \
+	man/SD_ID128_MAKE.3 \
+	man/SD_ID128_FORMAT_STR.3 \
+	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_sendv.3 \
+	man/sd_journal_open_directory.3 \
+	man/sd_journal_close.3 \
+	man/sd_journal_previous.3 \
+	man/sd_journal_next_skip.3 \
+	man/sd_journal_previous_skip.3 \
+	man/SD_JOURNAL_FOREACH.3 \
+	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_get_monotonic_usec.3 \
+	man/sd_journal_get_cutoff_monotonic_usec.3
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -579,6 +598,18 @@ man/sd_id128_get_boot.3: man/sd_id128_randomize.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_open_directory.3: man/sd_journal_open.3
+man/sd_journal_close.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
+man/SD_JOURNAL_FOREACH.3: man/sd_journal_next.3
+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
 
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -876,7 +907,9 @@ libsystemd_core_la_SOURCES = \
 	src/core/build.h \
 	src/core/sysfs-show.h \
 	src/core/switch-root.h \
-	src/core/switch-root.c
+	src/core/switch-root.c \
+	src/core/killall.h \
+	src/core/killall.c
 
 nodist_libsystemd_core_la_SOURCES = \
 	src/core/load-fragment-gperf.c \
@@ -993,7 +1026,8 @@ noinst_PROGRAMS += \
 TESTS += \
 	test-job-type \
 	test-env-replace \
-	test-strv
+	test-strv \
+	test-unit-name
 
 test_engine_SOURCES = \
 	src/test/test-engine.c
@@ -1132,7 +1166,9 @@ systemd_shutdown_SOURCES = \
 	src/core/umount.h \
 	src/core/shutdown.c \
 	src/core/mount-setup.c \
-	src/core/mount-setup.h
+	src/core/mount-setup.h \
+	src/core/killall.h \
+	src/core/killall.c
 
 systemd_shutdown_LDADD = \
 	libsystemd-label.la \
@@ -2332,6 +2368,11 @@ noinst_PROGRAMS += \
 	test-journal-match \
 	test-journal-stream
 
+TESTS += \
+	test-journal
+	test-journal-match \
+	test-journal-stream
+
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
 	src/systemd/sd-messages.h