build-sys: prepare 195

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4c650765cc653169018589667a57551240d17afd..da46e583b528315e53b9712a3c66bd1cb5023d0c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = . po
 .DELETE_ON_ERROR:
 
 LIBUDEV_CURRENT=2
-LIBUDEV_REVISION=5
+LIBUDEV_REVISION=6
 LIBUDEV_AGE=1
 
 LIBGUDEV_CURRENT=1
@@ -35,7 +35,7 @@ LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=8
+LIBSYSTEMD_LOGIN_REVISION=9
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -43,12 +43,12 @@ LIBSYSTEMD_DAEMON_REVISION=5
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=14
+LIBSYSTEMD_ID128_REVISION=15
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=5
-LIBSYSTEMD_JOURNAL_REVISION=4
-LIBSYSTEMD_JOURNAL_AGE=5
+LIBSYSTEMD_JOURNAL_CURRENT=6
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=6
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -482,6 +482,7 @@ MANPAGES = \
        man/journald.conf.5 \
        man/systemd-journald.service.8 \
        man/journalctl.1 \
+       man/systemd-coredumpctl.1 \
        man/systemd-inhibit.1 \
        man/systemd-remount-fs.service.8 \
        man/systemd-update-utmp-runlevel.service.8 \
@@ -745,6 +746,7 @@ libsystemd_shared_la_SOURCES = \
        src/shared/list.h \
        src/shared/macro.h \
        src/shared/def.h \
+       src/shared/sparse-endian.h \
        src/shared/util.c \
        src/shared/util.h \
        src/shared/virt.c \
@@ -757,6 +759,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/set.h \
        src/shared/strv.c \
        src/shared/strv.h \
+       src/shared/strbuf.c \
+       src/shared/strbuf.h \
        src/shared/conf-parser.c \
        src/shared/conf-parser.h \
        src/shared/log.c \
@@ -2457,6 +2461,13 @@ journalctl_LDADD += \
        $(QRENCODE_LIBS)
 endif
 
+systemd_coredumpctl_SOURCES = \
+       src/journal/coredumpctl.c
+
+systemd_coredumpctl_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-journal.la
+
 test_journal_SOURCES = \
        src/journal/test-journal.c
 
@@ -2525,7 +2536,6 @@ libsystemd_journal_la_SOURCES = \
        src/journal/lookup3.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 \
@@ -2647,6 +2657,7 @@ rootbin_PROGRAMS += \
        journalctl
 
 bin_PROGRAMS += \
+       systemd-coredumpctl \
        systemd-cat
 
 dist_systemunit_DATA += \
@@ -3159,6 +3170,24 @@ dist_noinst_SCRIPT = \
 update-kbd-model-map:
        src/locale/generate-kbd-model-map > src/locale/kbd-model-map
 
+localectl_SOURCES = \
+       src/locale/localectl.c
+
+localectl_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+localectl_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-dbus.la \
+       libsystemd-id128-internal.la
+
+bin_PROGRAMS += \
+       localectl
+
+MANPAGES += \
+       man/localectl.1
+
 endif
 
 polkitpolicy_in_files += \
@@ -3752,6 +3781,10 @@ EXTRA_DIST += \
        docs/sysvinit/README.in \
        docs/var-log/README.in
 
+CLEANFILES += \
+       docs/sysvinit/README \
+       docs/var-log/README
+
 endif
 
 
@@ -3920,6 +3953,7 @@ clean-local:
        rm -rf $(abs_srcdir)/install-tree
 
 DISTCHECK_CONFIGURE_FLAGS = \
+       --with-sysvinit-path=$$dc_install_base/$(sysvinitdir) \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
        --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \