X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=1bdc91c2390ac1a38dbba43eae633db86ac6e19c;hb=2f88c8583aea6626c5f0a84cfc6de4b0a17f2d1c;hp=f80ffc67491760535f4af0daa98b7b8ea1a859b4;hpb=810626a80de8361dfbe27110d585023b3d6167a6;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index f80ffc674..1bdc91c23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -387,7 +387,6 @@ rootlibexec_PROGRAMS = \
 	systemd-ac-power \
 	systemd-sysctl \
 	systemd-sleep \
-	systemd-bus-proxyd \
 	systemd-socket-proxyd \
 	systemd-update-done
 
@@ -721,7 +720,6 @@ EXTRA_DIST += \
 	$(man_MANS) \
 	tools/make-man-index.py \
 	tools/make-directive-index.py \
-	tools/make-man-rules.py \
 	tools/xml_helper.py
 
 # ------------------------------------------------------------------------------
@@ -1342,7 +1340,8 @@ tests += \
 	test-async \
 	test-ratelimit \
 	test-condition-util \
-	test-uid-range
+	test-uid-range \
+	test-bus-policy
 
 EXTRA_DIST += \
 	test/a.service \
@@ -1374,7 +1373,12 @@ EXTRA_DIST += \
 	test/sysinit.target \
 	test/testsuite.target \
 	test/timers.target \
-	test/unstoppable.service
+	test/unstoppable.service \
+	test/bus-policy/hello.conf \
+	test/bus-policy/methods.conf \
+	test/bus-policy/ownerships.conf \
+	test/bus-policy/signals.conf
+
 
 EXTRA_DIST += \
 	src/test/test-helper.h
@@ -1782,6 +1786,16 @@ test_conf_files_SOURCES = \
 test_conf_files_LDADD = \
 	libsystemd-shared.la
 
+test_bus_policy_SOURCES = \
+	src/bus-proxyd/test-bus-policy.c \
+	src/bus-proxyd/bus-policy.c \
+	src/bus-proxyd/bus-policy.h
+
+test_bus_policy_LDADD = \
+	libsystemd-capability.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
 .PHONY: coverage lcov-run lcov-report coverage-sync
@@ -2034,9 +2048,11 @@ endif
 dist_factory_etc_DATA = \
 	factory/etc/nsswitch.conf
 
+if HAVE_PAM
 dist_factory_pam_DATA = \
 	factory/etc/pam.d/system-auth \
 	factory/etc/pam.d/other
+endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_FIRSTBOOT
@@ -2330,8 +2346,7 @@ systemctl_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_notify_SOURCES = \
-	src/notify/notify.c \
-	src/readahead/sd-readahead.c
+	src/notify/notify.c
 
 systemd_notify_LDADD = \
 	libsystemd-internal.la \
@@ -2413,6 +2428,10 @@ systemd_run_LDADD = \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+if ENABLE_KDBUS
+rootlibexec_PROGRAMS += \
+	systemd-bus-proxyd
+
 systemd_bus_proxyd_SOURCES = \
 	src/bus-proxyd/bus-proxyd.c \
 	src/bus-proxyd/bus-policy.c \
@@ -2434,7 +2453,6 @@ bus-proxyd-uninstall-hook:
 INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
 UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
 
-if ENABLE_KDBUS
 nodist_systemunit_DATA += \
 	units/systemd-bus-proxyd@.service
 
@@ -4316,57 +4334,6 @@ endif
 EXTRA_DIST += \
 	units/systemd-vconsole-setup.service.in
 
-# ------------------------------------------------------------------------------
-if ENABLE_READAHEAD
-systemd_readahead_SOURCES = \
-	src/readahead/readahead.c \
-	src/readahead/readahead-collect.c \
-	src/readahead/readahead-replay.c \
-	src/readahead/readahead-analyze.c \
-	src/readahead/readahead-common.c \
-	src/readahead/readahead-common.h
-
-systemd_readahead_LDADD = \
-	libsystemd-internal.la \
-	libudev-internal.la \
-	libsystemd-shared.la
-
-dist_doc_DATA += \
-	src/readahead/sd-readahead.c \
-	src/systemd/sd-readahead.h
-
-rootlibexec_PROGRAMS += \
-	systemd-readahead
-
-dist_systemunit_DATA += \
-	units/systemd-readahead-drop.service \
-	units/systemd-readahead-done.timer
-
-nodist_systemunit_DATA += \
-	units/systemd-readahead-collect.service \
-	units/systemd-readahead-replay.service \
-	units/systemd-readahead-done.service
-
-manual_tests += \
-	test-ssd
-
-test_ssd_SOURCES = \
-	src/readahead/test-ssd.c \
-	src/readahead/readahead-common.c \
-	src/readahead/readahead-common.h
-
-test_ssd_LDADD = \
-	libsystemd-internal.la \
-	libudev-internal.la \
-	libsystemd-shared.la
-
-endif
-
-EXTRA_DIST += \
-	units/systemd-readahead-collect.service.in \
-	units/systemd-readahead-replay.service.in \
-	units/systemd-readahead-done.service.in
-
 # ------------------------------------------------------------------------------
 if ENABLE_BOOTCHART
 systemd_bootchart_SOURCES = \