X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d4c2f8577d6a27ccc1e970ffd74cae11af51daa4;hp=1e155d5abd999d21d631db334d4cc4f0a3f3e588;hb=d2bbca6855b174fb7ea90b4767a886bb88bd2400;hpb=3e8037f17c985a99b26fff92917e8567480ab246

diff --git a/Makefile.am b/Makefile.am
index 1e155d5ab..d4c2f8577 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -331,6 +331,7 @@ systemd_analyze_LDADD = \
 dist_bashcompletion_DATA = \
 	shell-completion/bash/journalctl \
 	shell-completion/bash/systemctl \
+	shell-completion/bash/systemd-analyze \
 	shell-completion/bash/udevadm
 
 dist_tmpfiles_DATA = \
@@ -441,7 +442,8 @@ nodist_systemunit_DATA = \
 	units/initrd-parse-etc.service \
 	units/initrd-cleanup.service \
 	units/initrd-udevadm-cleanup-db.service \
-	units/initrd-switch-root.service
+	units/initrd-switch-root.service \
+	units/systemd-nspawn@.service
 
 dist_userunit_DATA = \
 	units/user/default.target \
@@ -488,6 +490,7 @@ EXTRA_DIST += \
 	units/initrd-cleanup.service.in \
 	units/initrd-udevadm-cleanup-db.service.in \
 	units/initrd-switch-root.service.in \
+	units/systemd-nspawn@.service.in \
 	introspect.awk
 
 CLEANFILES += \
@@ -1099,7 +1102,8 @@ tests += \
 	test-cgroup-util \
 	test-prioq \
 	test-fileio \
-	test-time
+	test-time \
+	test-hashmap
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1190,6 +1194,15 @@ test_util_CFLAGS = \
 test_util_LDADD = \
 	libsystemd-core.la
 
+test_hashmap_SOURCES = \
+	src/test/test-hashmap.c
+
+test_hashmap_CFLAGS = \
+	$(AM_CFLAGS)
+
+test_hashmap_LDADD = \
+	libsystemd-core.la
+
 test_prioq_SOURCES = \
 	src/test/test-prioq.c
 
@@ -3584,6 +3597,7 @@ pam_systemd_la_LIBADD = \
 	libsystemd-audit.la \
 	libsystemd-dbus.la \
 	libsystemd-shared.la \
+	libsystemd-daemon-internal.la \
 	$(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
@@ -3763,7 +3777,8 @@ _reader_la_LIBADD = \
 	$(PYTHON_LIBS) \
 	libsystemd-journal.la \
 	libsystemd-id128.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	libsystemd-daemon-internal.la
 
 dist_pkgpyexec_PYTHON = \
 	src/python-systemd/journal.py \
@@ -4146,11 +4161,11 @@ upload: all distcheck
 www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
 doc-sync: all destdir-sphinx
 	gtkdoc-rebase --html-dir=docs/libudev/html --online
-	rsync -av --delete docs/libudev/html/ --omit-dir-times $(www_target)/libudev/
+	rsync -rlv --delete docs/libudev/html/ --omit-dir-times $(www_target)/libudev/
 	gtkdoc-rebase --html-dir=docs/gudev/html --online
-	rsync -av --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
-	rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
-	rsync -av --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
+	rsync -rlv --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
+	rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
+	rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
 
 git-tag:
 	git tag "v$(VERSION)" -m "systemd $(VERSION)"