journald: remove unused variable

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7e6361c2e8f24a4d0ef2c7a01f97b718d03907f0..b8b8d06629e2413e6cead755730e4defd100e0ac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,8 +31,11 @@ SUBDIRS = . po
 # keep intermediate files
 .SECONDARY:
 
+# Keep the test-suite.log
+.PRECIOUS: $(TEST_SUITE_LOG) Makefile
+
 LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=6
+LIBUDEV_REVISION=7
 LIBUDEV_AGE=3
 
 LIBGUDEV_CURRENT=1
@@ -40,7 +43,7 @@ LIBGUDEV_REVISION=3
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=8
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1
 LIBSYSTEMD_LOGIN_AGE=8
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -48,11 +51,11 @@ LIBSYSTEMD_DAEMON_REVISION=10
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=23
+LIBSYSTEMD_ID128_REVISION=24
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=1
 LIBSYSTEMD_JOURNAL_AGE=11
 
 # Dirs of external packages
@@ -65,6 +68,7 @@ pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
+zshcompletiondir=@zshcompletiondir@
 rpmmacrosdir=$(prefix)/lib/rpm/macros.d
 sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
 sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
@@ -78,9 +82,9 @@ 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
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
+usergeneratordir=$(prefix)/lib/systemd/user-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemsleepdir=$(rootlibexecdir)/system-sleep
 systemunitdir=$(rootprefix)/lib/systemd/system
@@ -312,7 +316,6 @@ rootlibexec_PROGRAMS = \
        systemd-remount-fs \
        systemd-reply-password \
        systemd-fsck \
-       systemd-timestamp \
        systemd-ac-power \
        systemd-sysctl \
        systemd-sleep
@@ -337,7 +340,17 @@ dist_bashcompletion_DATA = \
        shell-completion/bash/journalctl \
        shell-completion/bash/systemctl \
        shell-completion/bash/systemd-analyze \
-       shell-completion/bash/udevadm
+       shell-completion/bash/udevadm \
+       shell-completion/bash/kernel-install
+
+dist_zshcompletion_DATA = \
+       shell-completion/zsh/_systemctl \
+       shell-completion/zsh/_journalctl \
+       shell-completion/zsh/_udevadm \
+       shell-completion/zsh/_kernel-install \
+       shell-completion/zsh/_systemd-nspawn \
+       shell-completion/zsh/_systemd-analyze \
+       shell-completion/zsh/_systemd
 
 dist_sysctl_DATA = \
        sysctl.d/50-default.conf
@@ -749,6 +762,7 @@ libsystemd_label_la_SOURCES = \
        src/shared/selinux-util.c \
        src/shared/selinux-util.h \
        src/shared/mkdir.c \
+       src/shared/mkdir-label.c \
        src/shared/mkdir.h \
        src/shared/ask-password-api.c \
        src/shared/ask-password-api.h \
@@ -1552,6 +1566,9 @@ SYSINIT_TARGET_WANTS += \
        systemd-tmpfiles-setup-dev.service \
        systemd-tmpfiles-setup.service
 
+dist_zshcompletion_DATA += \
+       shell-completion/zsh/_systemd-tmpfiles
+
 TIMERS_TARGET_WANTS += \
        systemd-tmpfiles-clean.timer
 
@@ -1603,13 +1620,6 @@ systemd_fsck_LDADD = \
        libsystemd-dbus.la \
        libudev.la
 
-# ------------------------------------------------------------------------------
-systemd_timestamp_SOURCES = \
-       src/timestamp/timestamp.c
-
-systemd_timestamp_LDADD = \
-       libsystemd-shared.la
-
 # ------------------------------------------------------------------------------
 systemd_ac_power_SOURCES = \
        src/ac-power/ac-power.c
@@ -1838,6 +1848,9 @@ libsystemd_daemon_la_LDFLAGS = \
        -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
 
+libsystemd_daemon_la_LIBADD =  \
+       $(RT_LIBS)
+
 pkginclude_HEADERS += \
        src/systemd/sd-daemon.h
 
@@ -2077,6 +2090,7 @@ libudev_la_LIBADD = \
        libsystemd-shared.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
+       $(RT_LIBS) \
        libsystemd-id128-internal.la
 
 pkgconfiglib_DATA += \
@@ -2248,6 +2262,7 @@ libudev_core_la_LIBADD = \
        libudev-private.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
+       $(RT_LIBS) \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
@@ -2634,7 +2649,8 @@ libsystemd_id128_la_LDFLAGS = \
 libsystemd_id128_la_LIBADD = \
        libsystemd-shared.la \
        libsystemd-label.la \
-       libsystemd-daemon-internal.la
+       libsystemd-daemon-internal.la \
+       $(RT_LIBS)
 
 libsystemd_id128_internal_la_SOURCES = \
        $(libsystemd_id128_la_SOURCES)
@@ -2781,6 +2797,15 @@ test_journal_stream_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la
 
+test_journal_init_SOURCES = \
+       src/journal/test-journal-init.c
+
+test_journal_init_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-daemon-internal.la \
+       $(RT_LIBS) \
+       libsystemd-journal.la
+
 test_journal_verify_SOURCES = \
        src/journal/test-journal-verify.c
 
@@ -2845,6 +2870,7 @@ libsystemd_journal_la_LIBADD = \
        libsystemd-shared.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
+       $(RT_LIBS) \
        libsystemd-id128-internal.la
 
 libsystemd_journal_internal_la_SOURCES = \
@@ -2971,6 +2997,7 @@ tests += \
        test-journal-syslog \
        test-journal-match \
        test-journal-stream \
+       test-journal-init \
        test-journal-verify \
        test-journal-interleaving \
        test-mmap-cache \
@@ -3090,7 +3117,9 @@ systemd_coredumpctl_SOURCES = \
 
 systemd_coredumpctl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-journal.la
+       libsystemd-journal.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la
 
 bin_PROGRAMS += \
        systemd-coredumpctl
@@ -3098,6 +3127,9 @@ bin_PROGRAMS += \
 dist_bashcompletion_DATA += \
        shell-completion/bash/systemd-coredumpctl
 
+dist_zshcompletion_DATA += \
+       shell-completion/zsh/_systemd-coredumpctl
+
 sysctl_DATA = \
        sysctl.d/50-coredump.conf
 
@@ -3358,6 +3390,9 @@ bin_PROGRAMS += \
 dist_bashcompletion_DATA += \
        shell-completion/bash/hostnamectl
 
+dist_zshcompletion_DATA += \
+       shell-completion/zsh/_hostnamectl
+
 endif
 
 polkitpolicy_in_files += \
@@ -3434,6 +3469,9 @@ bin_PROGRAMS += \
 dist_bashcompletion_DATA += \
        shell-completion/bash/localectl
 
+dist_zshcompletion_DATA += \
+       shell-completion/zsh/_localectl
+
 endif
 
 polkitpolicy_in_files += \
@@ -3503,6 +3541,9 @@ bin_PROGRAMS += \
 
 dist_bashcompletion_DATA += \
        shell-completion/bash/timedatectl
+
+dist_zshcompletion_DATA += \
+       shell-completion/zsh/_timedatectl
 endif
 
 polkitpolicy_in_files += \
@@ -3611,6 +3652,9 @@ dist_dbussystemservice_DATA += \
 dist_dbuspolicy_DATA += \
        src/machine/org.freedesktop.machine1.conf
 
+dist_zshcompletion_DATA += \
+       shell-completion/zsh/_machinectl
+
 SYSTEM_UNIT_ALIASES += \
        systemd-machined.service dbus-org.freedesktop.machine1.service
 
@@ -3709,6 +3753,10 @@ rootbin_PROGRAMS += \
 dist_bashcompletion_DATA += \
        shell-completion/bash/loginctl
 
+dist_zshcompletion_DATA += \
+       shell-completion/zsh/_loginctl \
+       shell-completion/zsh/_systemd-inhibit
+
 systemd_inhibit_SOURCES = \
        src/login/inhibit.c
 
@@ -3772,7 +3820,8 @@ libsystemd_login_la_LDFLAGS = \
 
 libsystemd_login_la_LIBADD = \
        libsystemd-shared.la \
-       libsystemd-daemon-internal.la
+       libsystemd-daemon-internal.la \
+       $(RT_LIBS)
 
 libsystemd_login_internal_la_SOURCES = \
        $(libsystemd_login_la_SOURCES)
@@ -3800,6 +3849,7 @@ pam_systemd_la_LIBADD = \
        libsystemd-dbus.la \
        libsystemd-shared.la \
        libsystemd-daemon-internal.la \
+       $(RT_LIBS) \
        $(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
@@ -3908,7 +3958,7 @@ _journal_la_SOURCES = \
 _journal_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=default \
-       $(PYTHON_CFLAGS)
+       $(PYTHON_DEVEL_CFLAGS)
 
 _journal_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -3917,7 +3967,7 @@ _journal_la_LDFLAGS = \
        -avoid-version
 
 _journal_la_LIBADD = \
-       $(PYTHON_LIBS) \
+       $(PYTHON_DEVEL_LIBS) \
        libsystemd-journal.la
 
 id128_la_SOURCES = \
@@ -3929,7 +3979,7 @@ id128_la_SOURCES = \
 id128_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=default \
-       $(PYTHON_CFLAGS) \
+       $(PYTHON_DEVEL_CFLAGS) \
        -I$(top_builddir)/src/python-systemd
 
 id128_la_LDFLAGS = \
@@ -3939,7 +3989,7 @@ id128_la_LDFLAGS = \
        -avoid-version
 
 id128_la_LIBADD = \
-       $(PYTHON_LIBS) \
+       $(PYTHON_DEVEL_LIBS) \
        libsystemd-id128.la
 
 _daemon_la_SOURCES = \
@@ -3950,7 +4000,7 @@ _daemon_la_SOURCES = \
 _daemon_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=default \
-       $(PYTHON_CFLAGS) \
+       $(PYTHON_DEVEL_CFLAGS) \
        -I$(top_builddir)/src/python-systemd
 
 _daemon_la_LDFLAGS = \
@@ -3960,7 +4010,7 @@ _daemon_la_LDFLAGS = \
        -avoid-version
 
 _daemon_la_LIBADD = \
-       $(PYTHON_LIBS) \
+       $(PYTHON_DEVEL_LIBS) \
        libsystemd-daemon.la
 
 _reader_la_SOURCES = \
@@ -3971,7 +4021,7 @@ _reader_la_SOURCES = \
 _reader_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=default \
-       $(PYTHON_CFLAGS)
+       $(PYTHON_DEVEL_CFLAGS)
 
 _reader_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -3980,11 +4030,12 @@ _reader_la_LDFLAGS = \
        -avoid-version
 
 _reader_la_LIBADD = \
-       $(PYTHON_LIBS) \
+       $(PYTHON_DEVEL_LIBS) \
        libsystemd-journal.la \
        libsystemd-id128.la \
        libsystemd-shared.la \
-       libsystemd-daemon-internal.la
+       libsystemd-daemon-internal.la \
+       $(RT_LIBS)
 
 login_la_SOURCES = \
        src/python-systemd/login.c \
@@ -3994,7 +4045,7 @@ login_la_SOURCES = \
 login_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=default \
-       $(PYTHON_CFLAGS)
+       $(PYTHON_DEVEL_CFLAGS)
 
 login_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -4003,11 +4054,12 @@ login_la_LDFLAGS = \
        -avoid-version
 
 login_la_LIBADD = \
-       $(PYTHON_LIBS) \
+       $(PYTHON_DEVEL_LIBS) \
        libsystemd-journal.la \
        libsystemd-login.la \
        libsystemd-shared.la \
-       libsystemd-daemon-internal.la
+       libsystemd-daemon-internal.la \
+       $(RT_LIBS)
 
 dist_pkgpyexec_PYTHON = \
        src/python-systemd/journal.py \
@@ -4064,6 +4116,8 @@ substitutions = \
        '|catalogdir=$(catalogdir)|' \
        '|tmpfilesdir=$(tmpfilesdir)|' \
        '|sysctldir=$(sysctldir)|' \
+       '|systemgeneratordir=$(systemgeneratordir)|' \
+       '|usergeneratordir=$(usergeneratordir)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
@@ -4234,9 +4288,6 @@ EXTRA_DIST += \
        docs/sysvinit/README.in \
        docs/var-log/README.in
 
-EXTRA_DIST += \
-       shell-completion/systemd-zsh-completion.zsh
-
 SOCKETS_TARGET_WANTS += \
        systemd-initctl.socket \
        systemd-shutdownd.socket
@@ -4351,6 +4402,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
+       --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-rootprefix=$$dc_install_base \
        --disable-split-usr