chiark / gitweb /
nspawn: use automatic cleanup for umask
[elogind.git] / Makefile.am
index f220b59..12c2d2e 100644 (file)
@@ -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
@@ -65,6 +65,7 @@ rpmmacrosdir=$(sysconfdir)/rpm
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
+userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -73,6 +74,7 @@ systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
+systempresetdir=$(rootprefix)/lib/systemd/system-preset
 udevlibexecdir=$(rootprefix)/lib/udev
 udevhomedir = $(udevlibexecdir)
 udevrulesdir = $(udevlibexecdir)/rules.d
@@ -382,6 +384,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
 
@@ -468,7 +471,7 @@ MANPAGES = \
        man/systemd.conf.5 \
        man/tmpfiles.d.5 \
        man/hostname.5 \
-       man/timezone.5 \
+       man/localtime.5 \
        man/machine-id.5 \
        man/locale.conf.5 \
        man/os-release.5 \
@@ -513,6 +516,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 +1007,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 +1122,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 +1181,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 +1309,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 +2203,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,8 +2330,18 @@ EXTRA_DIST += \
 systemd_journald_SOURCES = \
        src/journal/journald.c \
        src/journal/journald.h \
-       src/journal/journal-rate-limit.c \
-       src/journal/journal-rate-limit.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 = \
@@ -2321,7 +2353,8 @@ systemd_journald_LDADD = \
        libsystemd-audit.la \
        libsystemd-daemon.la \
        libsystemd-id128-internal.la \
-       libsystemd-journal-internal.la
+       libsystemd-journal-internal.la \
+       libudev.la
 
 if ENABLE_LOGIND
 systemd_journald_LDADD += \
@@ -2352,6 +2385,18 @@ journalctl_LDADD = \
        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
 
@@ -2397,10 +2442,13 @@ libsystemd_journal_la_SOURCES = \
        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/lookup3.h \
        src/journal/journal-send.c \
-       src/journal/journal-send.h \
        src/journal/sparse-endian.h \
        src/journal/journal-def.h \
        src/journal/compress.h \
@@ -2449,6 +2497,8 @@ 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
 
@@ -2539,8 +2589,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
@@ -2746,6 +2797,9 @@ endif
 EXTRA_DIST += \
        units/systemd-quotacheck.service.in
 
+nodist_systemunit_DATA += \
+       units/quotaon.service
+
 # ------------------------------------------------------------------------------
 if ENABLE_RANDOMSEED
 rootlibexec_PROGRAMS += \
@@ -3015,8 +3069,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 )
@@ -3356,6 +3410,37 @@ 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 \
+       $(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' \
@@ -3367,6 +3452,8 @@ SED_PROCESS = \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
                -e 's,@systemunitdir\@,$(systemunitdir),g' \
                -e 's,@userunitdir\@,$(userunitdir),g' \
+               -e 's,@systempresetdir\@,$(systempresetdir),g' \
+               -e 's,@userpresetdir\@,$(userpresetdir),g' \
                -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
@@ -3379,6 +3466,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
@@ -3444,7 +3533,7 @@ CLEANFILES += \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA)
 
-if HAVE_XSLTPROC
+if ENABLE_MANPAGES
 XSLTPROC_FLAGS = \
        --nonet \
        --stringparam man.output.quietly 1 \