chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update TODO
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 3eeb842afe6edc39135c2a4bfe458f4be6a9f47f..730db1d5a888403b65fd687bd7c74a0808d39c53 100644 (file)
--- 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 = \
@@ -2309,8 +2328,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 = \
@@ -2322,7 +2351,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 += \
@@ -2353,6 +2383,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
 
@@ -2402,8 +2444,6 @@ libsystemd_journal_la_SOURCES = \
        src/journal/journal-vacuum.h \
        src/journal/journal-verify.c \
        src/journal/journal-verify.h \
-       src/journal/journal-authenticate.c \
-       src/journal/journal-authenticate.h \
        src/journal/lookup3.c \
        src/journal/lookup3.h \
        src/journal/journal-send.c \
@@ -2455,6 +2495,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
 
@@ -2545,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
@@ -2752,6 +2795,9 @@ endif
 EXTRA_DIST += \
        units/systemd-quotacheck.service.in
 
+nodist_systemunit_DATA += \
+       units/quotaon.service
+
 # ------------------------------------------------------------------------------
 if ENABLE_RANDOMSEED
 rootlibexec_PROGRAMS += \
@@ -3021,8 +3067,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 )
@@ -3385,6 +3431,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
@@ -3450,7 +3498,7 @@ CLEANFILES += \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA)
 
-if HAVE_XSLTPROC
+if ENABLE_MANPAGES
 XSLTPROC_FLAGS = \
        --nonet \
        --stringparam man.output.quietly 1 \
Unnamed repository; edit this file 'description' to name the repository.