X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=362c4661d38dbc81f218b941b896d79425471049;hp=aedd22052ba3ba694d3a7c4288a1327a7852a865;hb=95ea1b90cc61f464f3b9bc147119dee4ba9620b8;hpb=474abe33bba901142d1a5510850b29cbec739d0d

diff --git a/Makefile.am b/Makefile.am
index aedd22052..362c4661d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -495,11 +495,12 @@ MANPAGES = \
 	man/systemd-system-update-generator.8 \
 	man/systemd-fstab-generator.8 \
 	man/systemd.preset.5 \
-	man/sd-id128.7 \
+	man/sd-id128.3 \
 	man/sd_id128_to_string.3 \
 	man/sd_id128_randomize.3 \
-	man/sd-journal.7 \
-	man/sd_journal_print.3
+	man/sd-journal.3 \
+	man/sd_journal_print.3 \
+	man/sd_journal_stream_fd.3
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -529,11 +530,11 @@ 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 \
@@ -568,11 +569,11 @@ man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
 man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
 man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
 man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
-man/sd_id128_t.7: man/sd-id128.7
-man/SD_ID128_MAKE.7: man/sd-id128.7
-man/SD_ID128_FORMAT_STR.7: man/sd-id128.7
-man/SD_ID128_FORMAT_VAL.7: man/sd-id128.7
-man/sd_id128_equal.7: man/sd-id128.7
+man/sd_id128_t.3: man/sd-id128.3
+man/SD_ID128_MAKE.3: man/sd-id128.3
+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
@@ -726,7 +727,8 @@ libsystemd_logs_la_CFLAGS = \
 
 libsystemd_logs_la_LIBADD = \
 	libsystemd-journal-internal.la \
-	libsystemd-id128-internal.la
+	libsystemd-id128-internal.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -992,7 +994,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
@@ -1408,7 +1411,7 @@ pkgconfiglib_DATA += \
 	src/libsystemd-daemon/libsystemd-daemon.pc
 
 MANPAGES += \
-	man/sd-daemon.7 \
+	man/sd-daemon.3 \
 	man/sd_notify.3 \
 	man/sd_listen_fds.3 \
 	man/sd_is_fifo.3 \
@@ -2232,29 +2235,13 @@ journalctl_LDADD = \
 	libsystemd-logs.la
 
 test_journal_SOURCES = \
-	src/journal/test-journal.c \
-	src/journal/sd-journal.c \
-	src/journal/journal-file.c \
-	src/journal/lookup3.c \
-	src/journal/journal-send.c
+	src/journal/test-journal.c
 
 test_journal_LDADD = \
-	libsystemd-label.la \
 	libsystemd-shared.la \
+	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la
 
-if HAVE_XZ
-test_journal_SOURCES += \
-	src/journal/compress.c
-
-test_journal_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(XZ_CFLAGS)
-
-test_journal_LDADD += \
-	$(XZ_LIBS)
-endif
-
 test_journal_send_SOURCES = \
 	src/journal/test-journal-send.c
 
@@ -2263,6 +2250,22 @@ test_journal_send_LDADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la
 
+test_journal_match_SOURCES = \
+	src/journal/test-journal-match.c
+
+test_journal_match_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-journal-internal.la \
+	libsystemd-id128-internal.la
+
+test_journal_stream_SOURCES = \
+	src/journal/test-journal-stream.c
+
+test_journal_stream_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-journal-internal.la \
+	libsystemd-id128-internal.la
+
 libsystemd_journal_la_SOURCES = \
 	src/journal/sd-journal.c \
 	src/journal/journal-file.c \
@@ -2327,7 +2330,14 @@ UNINSTALL_EXEC_HOOKS += \
 
 noinst_PROGRAMS += \
 	test-journal \
-	test-journal-send
+	test-journal-send \
+	test-journal-match \
+	test-journal-stream
+
+TESTS += \
+	test-journal
+	test-journal-match \
+	test-journal-stream
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
@@ -2532,7 +2542,7 @@ EXTRA_DIST += \
 
 MANPAGES += \
 	man/sd_readahead.3 \
-	man/sd-readahead.7 \
+	man/sd-readahead.3 \
 	man/systemd-readahead-replay.service.8
 
 MANPAGES_ALIAS += \
@@ -3096,7 +3106,7 @@ nodist_udevrules_DATA += \
 MANPAGES += \
 	man/systemd-logind.service.8 \
 	man/logind.conf.5 \
-	man/sd-login.7 \
+	man/sd-login.3 \
 	man/loginctl.1 \
 	man/sd_login_monitor_new.3 \
 	man/sd_pid_get_session.3 \