X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=8885ab83d128f357f8ada266d73c730bcf3bbad8;hp=a72da90260629a5bf45271f106b10ba759139d5d;hb=0aee68ad028e696934367045e652a65865c0de52;hpb=a45b9fca6b91a767dcd9060cfcb30617dad234c7

diff --git a/Makefile.am b/Makefile.am
index a72da9026..8885ab83d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ 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
@@ -382,6 +382,7 @@ EXTRA_DIST += \
 	units/debug-shell.service.in \
 	units/systemd-hibernate.service.in \
 	units/systemd-suspend.service.in \
+	units/quotaon.service.in \
 	introspect.awk \
 	man/custom-html.xsl
 
@@ -513,6 +514,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 +1005,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 +1120,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 +1179,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 +1307,8 @@ systemd_tmpfiles_SOURCES = \
 
 systemd_tmpfiles_LDADD = \
 	libsystemd-label.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-capability.la
 
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
@@ -2315,8 +2334,12 @@ systemd_journald_SOURCES = \
 	src/journal/journald-syslog.h \
 	src/journal/journald-stream.c \
 	src/journal/journald-stream.h \
-	src/journal/journal-rate-limit.c \
-	src/journal/journal-rate-limit.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 = \
@@ -2564,8 +2587,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
@@ -2771,6 +2795,9 @@ endif
 EXTRA_DIST += \
 	units/systemd-quotacheck.service.in
 
+nodist_systemunit_DATA += \
+	units/quotaon.service
+
 # ------------------------------------------------------------------------------
 if ENABLE_RANDOMSEED
 rootlibexec_PROGRAMS += \
@@ -3381,6 +3408,38 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
+if HAVE_PYTHON_DEVEL
+
+pkgpyexec_LTLIBRARIES = \
+	_journal.la
+
+_journal_la_SOURCES = \
+	src/python-systemd/_journal.c
+
+_journal_la_CFLAGS = \
+	$(AM_CFLAGS) \
+        -fvisibility=default \
+	-Wno-missing-prototypes \
+	$(PYTHON_CFLAGS)
+
+_journal_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-shared \
+	-module \
+	-avoid-version
+
+_journal_la_LIBADD = \
+	$(PYTHON_LIBS) \
+	libsystemd-journal.la
+
+dist_pkgpyexec_PYTHON = \
+	src/python-systemd/journal.py \
+	src/python-systemd/__init__.py
+
+endif
+
+# ------------------------------------------------------------------------------
+
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(SED)	-e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
@@ -3404,6 +3463,8 @@ SED_PROCESS = \
 		-e 's,@rootprefix\@,$(rootprefix),g' \
 		-e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
 		-e 's,@sushell\@,$(sushell),g' \
+		-e 's,@QUOTAON\@,$(QUOTAON),g' \
+		-e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
 		< $< > $@
 
 units/%: units/%.in Makefile
@@ -3469,7 +3530,7 @@ CLEANFILES += \
 	$(pkgconfiglib_DATA) \
 	$(nodist_polkitpolicy_DATA)
 
-if HAVE_XSLTPROC
+if ENABLE_MANPAGES
 XSLTPROC_FLAGS = \
 	--nonet \
 	--stringparam man.output.quietly 1 \