X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=135d9f8ab19b8ca9f7740f221255f0250fa3b6f0;hp=ad8f71d821c3edb9f819df59305b9a8400f94d0c;hb=b5b46d599524341ddd7407e5dff1021af8ff5089;hpb=af18d7ca4b0a56e5051abf41bc3fdd2e3d8dc5b5

diff --git a/Makefile.am b/Makefile.am
index ad8f71d82..135d9f8ab 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,16 +26,16 @@ SUBDIRS = . po
 # remove targets if the command fails
 .DELETE_ON_ERROR:
 
-LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=4
-LIBUDEV_AGE=0
+LIBUDEV_CURRENT=2
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=1
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=2
+LIBSYSTEMD_LOGIN_REVISION=3
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -43,11 +43,11 @@ LIBSYSTEMD_DAEMON_REVISION=4
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=8
+LIBSYSTEMD_ID128_REVISION=9
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=4
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=1
 LIBSYSTEMD_JOURNAL_AGE=4
 
 # Dirs of external packages
@@ -513,6 +513,7 @@ MANPAGES = \
 	man/sd_journal_get_cutoff_realtime_usec.3 \
 	man/sd_journal_get_cursor.3 \
 	man/sd_journal_get_fd.3 \
+	man/sd_journal_get_usage.3 \
 	man/sd_journal_add_match.3 \
 	man/sd_journal_seek_head.3
 
@@ -1003,6 +1004,7 @@ libsystemd_core_la_LIBADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-dbus.la \
+	libsystemd-id128-internal.la \
 	libudev.la \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS) \
@@ -1117,13 +1119,16 @@ noinst_PROGRAMS += \
 	test-strv \
 	test-install \
 	test-watchdog \
-	test-unit-name
+	test-unit-name \
+	test-log \
+	test-unit-file
 
 TESTS += \
 	test-job-type \
 	test-env-replace \
 	test-strv \
-	test-unit-name
+	test-unit-name \
+	test-unit-file
 
 test_engine_SOURCES = \
 	src/test/test-engine.c
@@ -1173,6 +1178,18 @@ test_unit_name_SOURCES = \
 test_unit_name_LDADD = \
 	libsystemd-core.la
 
+test_unit_file_SOURCES = \
+	src/test/test-unit-file.c
+
+test_unit_file_LDADD = \
+	libsystemd-core.la
+
+test_log_SOURCES = \
+	src/test/test-log.c
+
+test_log_LDADD = \
+	libsystemd-core.la
+
 test_daemon_SOURCES = \
 	src/test/test-daemon.c
 
@@ -1289,7 +1306,8 @@ systemd_tmpfiles_SOURCES = \
 
 systemd_tmpfiles_LDADD = \
 	libsystemd-label.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-capability.la
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
@@ -2182,6 +2200,7 @@ dist_udevkeymap_DATA = \
 	keymaps/module-sony \
 	keymaps/module-sony-old \
 	keymaps/module-sony-vgn \
+	keymaps/module-sony-vpc \
 	keymaps/olpc-xo \
 	keymaps/onkyo \
 	keymaps/oqo-model2 \
@@ -2308,29 +2327,31 @@ EXTRA_DIST += \
 systemd_journald_SOURCES = \
 	src/journal/journald.c \
 	src/journal/journald.h \
-	src/journal/sd-journal.c \
-	src/journal/journal-file.c \
-	src/journal/journal-file.h \
-	src/journal/lookup3.c \
-	src/journal/lookup3.h \
-	src/journal/journal-rate-limit.c \
-	src/journal/journal-rate-limit.h \
-	src/journal/sparse-endian.h \
-	src/journal/journal-def.h \
-	src/journal/journal-internal.h \
-	src/journal/compress.h
+	src/journal/journald-kmsg.c \
+	src/journal/journald-kmsg.h \
+	src/journal/journald-syslog.c \
+	src/journal/journald-syslog.h \
+	src/journal/journald-stream.c \
+	src/journal/journald-stream.h \
+	src/journal/journald-console.c \
+	src/journal/journald-console.h \
+	src/journal/journald-native.c \
+	src/journal/journald-native.h \
+	src/journal/journald-rate-limit.c \
+	src/journal/journald-rate-limit.h \
+	src/journal/journal-internal.h
 
 nodist_systemd_journald_SOURCES = \
 	src/journal/journald-gperf.c
 
-systemd_journald_CFLAGS =
-
 systemd_journald_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
-	libsystemd-id128-internal.la
+	libsystemd-id128-internal.la \
+	libsystemd-journal-internal.la \
+	libudev.la
 
 if ENABLE_LOGIND
 systemd_journald_LDADD += \
@@ -2342,18 +2363,6 @@ systemd_journald_LDADD += \
 	libsystemd-acl.la
 endif
 
-if HAVE_XZ
-systemd_journald_SOURCES += \
-	src/journal/compress.c
-
-systemd_journald_CFLAGS += \
-	$(AM_CFLAGS) \
-	$(XZ_CFLAGS)
-
-systemd_journald_LDADD += \
-	$(XZ_LIBS)
-endif
-
 systemd_cat_SOURCES = \
 	src/journal/cat.c
 
@@ -2364,12 +2373,27 @@ systemd_cat_LDADD = \
 journalctl_SOURCES = \
 	src/journal/journalctl.c
 
+journalctl_CFLAGS = \
+	$(AM_CFLAGS)
+
 journalctl_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-logs.la
 
+if HAVE_QRENCODE
+journalctl_SOURCES += \
+	src/journal/journal-qrcode.c \
+	src/journal/journal-qrcode.h
+
+journalctl_CFLAGS += \
+	$(QRENCODE_CFLAGS)
+
+journalctl_LDADD += \
+	$(QRENCODE_LIBS)
+endif
+
 test_journal_SOURCES = \
 	src/journal/test-journal.c
 
@@ -2402,11 +2426,31 @@ test_journal_stream_LDADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la
 
+test_journal_verify_SOURCES = \
+	src/journal/test-journal-verify.c
+
+test_journal_verify_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-journal-internal.la \
+	libsystemd-id128-internal.la
+
 libsystemd_journal_la_SOURCES = \
 	src/journal/sd-journal.c \
+	src/systemd/sd-journal.h \
 	src/journal/journal-file.c \
+	src/journal/journal-file.h \
+	src/journal/journal-vacuum.c \
+	src/journal/journal-vacuum.h \
+	src/journal/journal-verify.c \
+	src/journal/journal-verify.h \
 	src/journal/lookup3.c \
-	src/journal/journal-send.c
+	src/journal/lookup3.h \
+	src/journal/journal-send.c \
+	src/journal/sparse-endian.h \
+	src/journal/journal-def.h \
+	src/journal/compress.h \
+	src/journal/mmap-cache.c \
+	src/journal/mmap-cache.h
 
 libsystemd_journal_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2425,26 +2469,51 @@ libsystemd_journal_la_LIBADD = \
 libsystemd_journal_internal_la_SOURCES = \
 	$(libsystemd_journal_la_SOURCES)
 
+libsystemd_journal_internal_la_CFLAGS = \
+	$(AM_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD =
+
 if HAVE_XZ
 libsystemd_journal_la_SOURCES += \
 	src/journal/compress.c
 
 libsystemd_journal_la_CFLAGS += \
-	$(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 
 libsystemd_journal_la_LIBADD += \
 	$(XZ_LIBS)
 
-libsystemd_journal_internal_la_CFLAGS = \
-	$(AM_CFLAGS)
+libsystemd_journal_internal_la_CFLAGS += \
 	$(XZ_CFLAGS)
 
-libsystemd_journal_internal_la_LIBADD = \
+libsystemd_journal_internal_la_LIBADD += \
 	$(XZ_LIBS)
 
 endif
 
+if HAVE_GCRYPT
+libsystemd_journal_la_SOURCES += \
+	src/journal/journal-authenticate.c \
+	src/journal/journal-authenticate.h \
+	src/journal/fsprg.c \
+	src/journal/fsprg.h
+
+libsystemd_journal_la_CFLAGS += \
+	$(GCRYPT_CFLAGS) \
+	-Wno-pointer-arith
+
+libsystemd_journal_la_LIBADD += \
+	$(GCRYPT_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS += \
+	$(GCRYPT_CFLAGS) \
+	-Wno-pointer-arith
+
+libsystemd_journal_internal_la_LIBADD += \
+	$(GCRYPT_LIBS)
+endif
+
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-journal-install-hook:
 	if test "$(libdir)" != "$(rootlibdir)"; then \
@@ -2468,12 +2537,14 @@ noinst_PROGRAMS += \
 	test-journal \
 	test-journal-send \
 	test-journal-match \
-	test-journal-stream
+	test-journal-stream \
+	test-journal-verify
 
 TESTS += \
 	test-journal \
 	test-journal-match \
-	test-journal-stream
+	test-journal-stream \
+	test-journal-verify
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
@@ -2515,8 +2586,9 @@ journal-install-data-hook:
 		rm -f systemd-journald.socket && \
 		$(LN_S) ../systemd-journald.socket )
 	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-		rm -f systemd-journald.service && \
-		$(LN_S) ../systemd-journald.service )
+		rm -f systemd-journald.service systemd-journal-flush.service && \
+		$(LN_S) ../systemd-journald.service && \
+		$(LN_S) ../systemd-journal-flush.service )
 
 INSTALL_DATA_HOOKS += \
 	journal-install-data-hook
@@ -2991,8 +3063,8 @@ dbusinterface_DATA += \
 
 timedated-install-data-hook:
 	$(MKDIR_P) -m 0755 \
-		$(DESTDIR)$(prefix)/lib/ntp-units.d \
-		$(DESTDIR)$(sysconfdir)/ntp-units.d
+		$(DESTDIR)$(prefix)/lib/systemd/ntp-units.d \
+		$(DESTDIR)$(sysconfdir)/systemd/ntp-units.d
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f dbus-org.freedesktop.timedate1.service  && \
 		$(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
@@ -3420,7 +3492,7 @@ CLEANFILES += \
 	$(pkgconfiglib_DATA) \
 	$(nodist_polkitpolicy_DATA)
 
-if HAVE_XSLTPROC
+if ENABLE_MANPAGES
 XSLTPROC_FLAGS = \
 	--nonet \
 	--stringparam man.output.quietly 1 \