X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=fd38e8201f325e9be1c70215f6c545b31a15f4e1;hp=fa4fea95ee6bf5b8f640e7eba38ac7f304543e72;hb=b534166eaec8fef9902a68f75cab8eeae458b23c;hpb=3731acf1acfb4a6eb68374a5b137f3b368f63381

diff --git a/Makefile.am b/Makefile.am
index fa4fea95e..fd38e8201 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -350,6 +350,8 @@ dist_zshcompletion_DATA = \
 	shell-completion/zsh/_kernel-install \
 	shell-completion/zsh/_systemd-nspawn \
 	shell-completion/zsh/_systemd-analyze \
+	shell-completion/zsh/_sd_hosts_or_user_at_host \
+	shell-completion/zsh/_systemd-delta \
 	shell-completion/zsh/_systemd
 
 dist_sysctl_DATA = \
@@ -1141,6 +1143,9 @@ EXTRA_DIST += \
 	test/sched_rr_ok.service \
 	test/sched_rr_change.service
 
+EXTRA_DIST += \
+	src/test/test-helper.h
+
 test_engine_SOURCES = \
 	src/test/test-engine.c
 
@@ -1339,7 +1344,8 @@ test_cgroup_util_SOURCES = \
 
 test_cgroup_util_LDADD = \
 	libsystemd-label.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-daemon.la
 
 test_env_replace_SOURCES = \
 	src/test/test-env-replace.c
@@ -2678,7 +2684,8 @@ test_id128_SOURCES = \
 
 test_id128_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-id128-internal.la
+	libsystemd-id128-internal.la \
+	libsystemd-daemon.la
 
 tests += \
 	test-id128
@@ -2850,6 +2857,10 @@ test_mmap_cache_LDADD = \
 test_catalog_SOURCES = \
 	src/journal/test-catalog.c
 
+test_catalog_CFLAGS = \
+	$(AM_CFLAGS) \
+	-DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
+
 test_catalog_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-label.la \
@@ -4134,6 +4145,11 @@ CLEAN_LOCAL_HOOKS += clean-sphinx
 clean-sphinx:
 	-rm -rf docs/html/python-systemd/
 
+# Remove Python stuff, e.g. to force rebuilding for a different Python version.
+clean-python:
+	-rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao]
+	-rm -f _daemon.la id128.la _journal.la login.la _reader.la
+
 # ------------------------------------------------------------------------------
 substitutions = \
        '|rootlibexecdir=$(rootlibexecdir)|' \