X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=b9c283503cff092f7fa1ad925e4809bebccab796;hp=9fa7944f37237af4ff4c97b3a23752f2c029c5fc;hb=7eb942c4086c563ca08f1b94c974d896eedb2e64;hpb=799d54be0b681c0329539fca604261994e7f8c0e

diff --git a/Makefile.am b/Makefile.am
index 9fa7944f3..b9c283503 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,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
@@ -345,6 +345,11 @@ dist_bashcompletion_DATA = \
 
 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 = \
@@ -1561,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
 
@@ -2786,6 +2794,14 @@ 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 \
+	libsystemd-journal.la
+
 test_journal_verify_SOURCES = \
 	src/journal/test-journal-verify.c
 
@@ -2976,6 +2992,7 @@ tests += \
 	test-journal-syslog \
 	test-journal-match \
 	test-journal-stream \
+	test-journal-init \
 	test-journal-verify \
 	test-journal-interleaving \
 	test-mmap-cache \
@@ -3095,7 +3112,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
@@ -3103,6 +3122,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
 
@@ -3363,6 +3385,9 @@ bin_PROGRAMS += \
 dist_bashcompletion_DATA += \
 	shell-completion/bash/hostnamectl
 
+dist_zshcompletion_DATA += \
+	shell-completion/zsh/_hostnamectl
+
 endif
 
 polkitpolicy_in_files += \
@@ -3439,6 +3464,9 @@ bin_PROGRAMS += \
 dist_bashcompletion_DATA += \
 	shell-completion/bash/localectl
 
+dist_zshcompletion_DATA += \
+	shell-completion/zsh/_localectl
+
 endif
 
 polkitpolicy_in_files += \
@@ -3508,6 +3536,9 @@ bin_PROGRAMS += \
 
 dist_bashcompletion_DATA += \
 	shell-completion/bash/timedatectl
+
+dist_zshcompletion_DATA += \
+	shell-completion/zsh/_timedatectl
 endif
 
 polkitpolicy_in_files += \
@@ -3616,6 +3647,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
 
@@ -3715,7 +3749,8 @@ dist_bashcompletion_DATA += \
 	shell-completion/bash/loginctl
 
 dist_zshcompletion_DATA += \
-	shell-completion/zsh/_loginctl
+	shell-completion/zsh/_loginctl \
+	shell-completion/zsh/_systemd-inhibit
 
 systemd_inhibit_SOURCES = \
 	src/login/inhibit.c
@@ -4072,6 +4107,8 @@ substitutions = \
        '|catalogdir=$(catalogdir)|' \
        '|tmpfilesdir=$(tmpfilesdir)|' \
        '|sysctldir=$(sysctldir)|' \
+       '|systemgeneratordir=$(systemgeneratordir)|' \
+       '|usergeneratordir=$(usergeneratordir)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \