X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=e714b6e10ed10139ffc9aa78f84e48f18f7ce8d3;hb=696c245a23d55e4249651573eb9c61b68e61580c;hp=621da03260040e8bc706420dbf7ebd602295c38d;hpb=f9b557200b6d59a3dce1623d0873a259ee2fe421;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 621da0326..e714b6e10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -580,7 +580,8 @@ MANPAGES_ALIAS = \
 	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/sd_journal_seek_cursor.3 \
+	man/sd_journal_test_cursor.3
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -649,6 +650,7 @@ 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
+man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3
 
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -1155,14 +1157,16 @@ noinst_PROGRAMS += \
 	test-watchdog \
 	test-unit-name \
 	test-log \
-	test-unit-file
+	test-unit-file \
+	test-date
 
 TESTS += \
 	test-job-type \
 	test-env-replace \
 	test-strv \
 	test-unit-name \
-	test-unit-file
+	test-unit-file \
+	test-date
 
 test_engine_SOURCES = \
 	src/test/test-engine.c
@@ -1224,6 +1228,12 @@ test_log_SOURCES = \
 test_log_LDADD = \
 	libsystemd-core.la
 
+test_date_SOURCES = \
+	src/test/test-date.c
+
+test_date_LDADD = \
+	libsystemd-core.la
+
 test_daemon_SOURCES = \
 	src/test/test-daemon.c
 
@@ -1403,6 +1413,12 @@ systemd_detect_virt_SOURCES = \
 systemd_detect_virt_LDADD = \
 	libsystemd-shared.la
 
+systemd-detect-virt-install-hook:
+	$(SETCAP) cap_dac_override,cap_sys_ptrace=ep $(DESTDIR)$(bindir)/systemd-detect-virt ||:
+
+INSTALL_EXEC_HOOKS += \
+	systemd-detect-virt-install-hook
+
 # ------------------------------------------------------------------------------
 systemd_delta_SOURCES = \
 	src/delta/delta.c
@@ -2446,6 +2462,15 @@ test_journal_send_LDADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la
 
+test_journal_syslog_SOURCES = \
+	src/journal/test-journal-syslog.c \
+	src/journal/journald-syslog.c
+
+test_journal_syslog_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-journal-internal.la \
+	libsystemd-id128-internal.la
+
 test_journal_match_SOURCES = \
 	src/journal/test-journal-match.c
 
@@ -2579,6 +2604,7 @@ UNINSTALL_EXEC_HOOKS += \
 noinst_PROGRAMS += \
 	test-journal \
 	test-journal-send \
+	test-journal-syslog \
 	test-journal-match \
 	test-journal-stream \
 	test-journal-verify \
@@ -2586,6 +2612,8 @@ noinst_PROGRAMS += \
 
 TESTS += \
 	test-journal \
+	test-journal-send \
+	test-journal-syslog \
 	test-journal-match \
 	test-journal-stream \
 	test-journal-verify \
@@ -2671,9 +2699,6 @@ systemd_journal_gatewayd_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(MICROHTTPD_CFLAGS)
 
-EXTRA_DIST += \
-	units/systemd-journal-gatewayd.service.in
-
 dist_systemunit_DATA += \
 	units/systemd-journal-gatewayd.socket
 
@@ -2685,6 +2710,9 @@ dist_gatewayddocumentroot_DATA = \
 
 endif
 
+EXTRA_DIST += \
+	units/systemd-journal-gatewayd.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \