X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=683685192100552f563082d60039aef6fc7f5b7a;hb=c1165f822cd9f8c3467b5f825ce933ab8374b361;hp=5a133da4668b2f49308b1e6d1f9b547a74fc582f;hpb=e1abd3efabb95a30d0702ed1c7c33c57bf898297;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 5a133da46..683685192 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = . po
 .DELETE_ON_ERROR:
 
 LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=4
 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=7
 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=13
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=4
-LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=4
+LIBSYSTEMD_JOURNAL_CURRENT=5
+LIBSYSTEMD_JOURNAL_REVISION=3
+LIBSYSTEMD_JOURNAL_AGE=5
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -702,7 +702,10 @@ XML_DIRECTIVE_FILES = \
 	man/systemd.timer.xml \
 	man/systemd.snapshot.xml \
 	man/systemd.exec.xml \
-	man/systemd.device.xml
+	man/systemd.kill.xml \
+	man/systemd.device.xml \
+	man/systemd.conf.xml \
+	man/systemd.journal-fields.xml
 
 man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -826,6 +829,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 \
@@ -906,6 +911,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 \
@@ -974,6 +981,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/dbus-path.h \
 	src/core/cgroup.c \
 	src/core/cgroup.h \
+	src/core/selinux-access.c \
+	src/core/selinux-access.h \
 	src/core/selinux-setup.c \
 	src/core/selinux-setup.h \
 	src/core/ima-setup.c \
@@ -1011,7 +1020,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 \
@@ -1033,6 +1044,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) \
@@ -1734,6 +1746,7 @@ dist_udevrules_DATA += \
 	rules/60-persistent-input.rules \
 	rules/60-persistent-alsa.rules \
 	rules/60-persistent-storage.rules \
+	rules/64-btrfs.rules \
 	rules/75-net-description.rules \
 	rules/75-tty-description.rules \
 	rules/78-sound-card.rules \
@@ -1794,6 +1807,7 @@ libudev_core_la_SOURCES = \
 	src/udev/udev-ctrl.c \
 	src/udev/udev-builtin.c \
 	src/udev/udev-builtin-blkid.c \
+	src/udev/udev-builtin-btrfs.c \
 	src/udev/udev-builtin-firmware.c \
 	src/udev/udev-builtin-hwdb.c \
 	src/udev/udev-builtin-input_id.c \
@@ -2463,6 +2477,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 \
@@ -2567,13 +2588,15 @@ noinst_PROGRAMS += \
 	test-journal-send \
 	test-journal-match \
 	test-journal-stream \
-	test-journal-verify
+	test-journal-verify \
+	test-mmap-cache
 
 TESTS += \
 	test-journal \
 	test-journal-match \
 	test-journal-stream \
-	test-journal-verify
+	test-journal-verify \
+	test-mmap-cache
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
@@ -2632,6 +2655,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)
+
+EXTRA_DIST += \
+	units/systemd-journal-gatewayd.service.in
+
+dist_systemunit_DATA += \
+	units/systemd-journal-gatewayd.socket
+
+nodist_systemunit_DATA += \
+	units/systemd-journal-gatewayd.service
+
+dist_gatewayddocumentroot_DATA = \
+	src/journal/browse.html
+
+endif
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -3342,8 +3402,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