X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=0a3ed18a4e82d491cdb49e17c6e0b1313cf52d38;hb=b87705cdd2f791f8520edb78791d3e6f78afd481;hp=637a5367b19bd2761b2859d8cacf42fd9fd06864;hpb=e2417e4143bb892e4599b01de7b031763421bb64;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 637a5367b..0a3ed18a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = . po
 .DELETE_ON_ERROR:
 
 LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=5
 LIBUDEV_AGE=1
 
 LIBGUDEV_CURRENT=1
@@ -35,20 +35,20 @@ LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=3
+LIBSYSTEMD_LOGIN_REVISION=8
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=4
+LIBSYSTEMD_DAEMON_REVISION=5
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=9
+LIBSYSTEMD_ID128_REVISION=14
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=4
-LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=4
+LIBSYSTEMD_JOURNAL_CURRENT=5
+LIBSYSTEMD_JOURNAL_REVISION=4
+LIBSYSTEMD_JOURNAL_AGE=5
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -160,43 +160,36 @@ AM_LDFLAGS = $(OUR_LDFLAGS)
 if TARGET_GENTOO
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\" \
-	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+	-DKBD_SETFONT=\"/usr/bin/setfont\"
 else
 if TARGET_ARCH
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\" \
-	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+	-DKBD_SETFONT=\"/usr/bin/setfont\"
 else
 if TARGET_FRUGALWARE
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\" \
-	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+	-DKBD_SETFONT=\"/usr/bin/setfont\"
 else
 if TARGET_MANDRIVA
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/bin/setfont\" \
-	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+	-DKBD_SETFONT=\"/bin/setfont\"
 else
 if TARGET_ANGSTROM
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/usr/bin/setfont\" \
-	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+	-DKBD_SETFONT=\"/usr/bin/setfont\"
 else
 if TARGET_MAGEIA
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/bin/setfont\" \
-	-DDEFAULT_FONT=\"LatArCyrHeb-16\"
+	-DKBD_SETFONT=\"/bin/setfont\"
 else
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-	-DKBD_SETFONT=\"/bin/setfont\" \
-	-DDEFAULT_FONT=\"latarcyrheb-sun16\"
+	-DKBD_SETFONT=\"/bin/setfont\"
 endif
 endif
 endif
@@ -551,6 +544,7 @@ MANPAGES_ALIAS = \
 	man/systemd-tmpfiles-clean.timer.8 \
 	man/sd_id128_t.3 \
 	man/SD_ID128_MAKE.3 \
+	man/SD_ID128_CONST_STR.3 \
 	man/SD_ID128_FORMAT_STR.3 \
 	man/SD_ID128_FORMAT_VAL.3 \
 	man/sd_id128_equal.3 \
@@ -587,7 +581,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
@@ -619,6 +614,7 @@ man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
 man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
 man/sd_id128_t.3: man/sd-id128.3
 man/SD_ID128_MAKE.3: man/sd-id128.3
+man/SD_ID128_CONST_STR.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
@@ -656,6 +652,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)}}}}}
@@ -829,6 +826,8 @@ libsystemd_label_la_SOURCES = \
 	src/shared/socket-label.c \
 	src/shared/label.c \
 	src/shared/label.h \
+	src/shared/selinux-util.c \
+	src/shared/selinux-util.h \
 	src/shared/mkdir.c \
 	src/shared/mkdir.h \
 	src/shared/ask-password-api.c \
@@ -909,6 +908,8 @@ noinst_LTLIBRARIES += \
 libsystemd_core_la_SOURCES = \
 	src/core/unit.c \
 	src/core/unit.h \
+	src/core/unit-printf.c \
+	src/core/unit-printf.h \
 	src/core/job.c \
 	src/core/job.h \
 	src/core/manager.c \
@@ -1016,7 +1017,9 @@ libsystemd_core_la_SOURCES = \
 	src/core/killall.h \
 	src/core/killall.c \
 	src/core/syscall-list.c \
-	src/core/syscall-list.h
+	src/core/syscall-list.h \
+	src/core/audit-fd.c \
+	src/core/audit-fd.h
 
 nodist_libsystemd_core_la_SOURCES = \
 	src/core/load-fragment-gperf.c \
@@ -1038,6 +1041,7 @@ libsystemd_core_la_LIBADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-dbus.la \
+	libsystemd-audit.la \
 	libsystemd-id128-internal.la \
 	libudev.la \
 	$(LIBWRAP_LIBS) \
@@ -1155,14 +1159,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 +1230,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 +1415,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 +2464,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
 
@@ -2470,6 +2497,13 @@ test_journal_verify_LDADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la
 
+test_mmap_cache_SOURCES = \
+	src/journal/test-mmap-cache.c
+
+test_mmap_cache_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-journal-internal.la
+
 libsystemd_journal_la_SOURCES = \
 	src/journal/sd-journal.c \
 	src/systemd/sd-journal.h \
@@ -2572,15 +2606,20 @@ UNINSTALL_EXEC_HOOKS += \
 noinst_PROGRAMS += \
 	test-journal \
 	test-journal-send \
+	test-journal-syslog \
 	test-journal-match \
 	test-journal-stream \
-	test-journal-verify
+	test-journal-verify \
+	test-mmap-cache
 
 TESTS += \
 	test-journal \
+	test-journal-send \
+	test-journal-syslog \
 	test-journal-match \
 	test-journal-stream \
-	test-journal-verify
+	test-journal-verify \
+	test-mmap-cache
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
@@ -2639,6 +2678,43 @@ EXTRA_DIST += \
 CLEANFILES += \
 	src/journal/journald-gperf.c
 
+if HAVE_MICROHTTPD
+
+gatewayddocumentrootdir=$(pkgdatadir)/gatewayd
+
+rootlibexec_PROGRAMS += \
+	systemd-journal-gatewayd
+
+systemd_journal_gatewayd_SOURCES = \
+	src/journal/journal-gatewayd.c
+
+systemd_journal_gatewayd_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-logs.la \
+	libsystemd-journal-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon.la \
+	$(MICROHTTPD_LIBS)
+
+systemd_journal_gatewayd_CFLAGS = \
+	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
+	$(AM_CFLAGS) \
+	$(MICROHTTPD_CFLAGS)
+
+dist_systemunit_DATA += \
+	units/systemd-journal-gatewayd.socket
+
+nodist_systemunit_DATA += \
+	units/systemd-journal-gatewayd.service
+
+dist_gatewayddocumentroot_DATA = \
+	src/journal/browse.html
+
+endif
+
+EXTRA_DIST += \
+	units/systemd-journal-gatewayd.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -3349,8 +3425,7 @@ systemd_multi_seat_x_SOURCES = \
 
 systemd_multi_seat_x_LDADD = \
 	libsystemd-label.la \
-	libsystemd-shared.la \
-	libudev.la
+	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
 	systemd-multi-seat-x