X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=4593245d40538629ebb3f282cd5a1660c4bf3d0d;hp=12254e39a8d64f30808ff7619f33685cba271e6e;hb=6c12b52e19640747e96f89d85422941a23dc6b29;hpb=4ad490007b70e6ac18d3cb04fa2ed92eba1451fa

diff --git a/Makefile.am b/Makefile.am
index 12254e39a..4593245d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -290,7 +290,8 @@ bin_PROGRAMS = \
 	systemd-nspawn \
 	systemd-detect-virt \
 	systemd-delta \
-	systemd-analyze
+	systemd-analyze \
+	systemd-run
 
 dist_bin_SCRIPTS = \
 	src/kernel-install/kernel-install
@@ -849,6 +850,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/path.h \
 	src/core/slice.c \
 	src/core/slice.h \
+	src/core/scope.c \
+	src/core/scope.h \
 	src/core/load-dropin.c \
 	src/core/load-dropin.h \
 	src/core/execute.c \
@@ -885,6 +888,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/dbus-path.h \
 	src/core/dbus-slice.c \
 	src/core/dbus-slice.h \
+	src/core/dbus-scope.c \
+	src/core/dbus-scope.h \
 	src/core/dbus-execute.c \
 	src/core/dbus-execute.h \
 	src/core/dbus-kill.c \
@@ -1098,7 +1103,8 @@ tests += \
 	test-prioq \
 	test-fileio \
 	test-time \
-	test-hashmap
+	test-hashmap \
+	test-list
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1202,6 +1208,15 @@ test_hashmap_CFLAGS = \
 test_hashmap_LDADD = \
 	libsystemd-core.la
 
+test_list_SOURCES = \
+	src/test/test-list.c
+
+test_list_CFLAGS = \
+	$(AM_CFLAGS)
+
+test_list_LDADD = \
+	libsystemd-core.la
+
 test_prioq_SOURCES = \
 	src/test/test-prioq.c
 
@@ -1705,6 +1720,18 @@ systemd_nspawn_LDADD = \
 	libsystemd-id128-internal.la \
 	libsystemd-bus.la
 
+# ------------------------------------------------------------------------------
+systemd_run_SOURCES = \
+	src/run/run.c
+
+systemd_run_LDADD = \
+	libsystemd-label.la \
+	libsystemd-capability.la \
+	libsystemd-shared.la \
+	libsystemd-daemon.la \
+	libsystemd-id128-internal.la \
+	libsystemd-bus.la
+
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
 	src/stdio-bridge/stdio-bridge.c
@@ -1976,6 +2003,7 @@ libudev_la_LDFLAGS = \
 
 libudev_la_LIBADD = \
 	libsystemd-shared.la \
+	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
 	libsystemd-id128-internal.la
 
@@ -2575,6 +2603,7 @@ dist_udevkeymap_DATA = \
 	keymaps/oqo-model2 \
 	keymaps/samsung-other \
 	keymaps/samsung-series-9 \
+	keymaps/samsung-series-3 \
 	keymaps/samsung-sq1us \
 	keymaps/samsung-sx20s \
 	keymaps/toshiba-satellite_a100 \
@@ -2589,6 +2618,7 @@ dist_udevkeymapforcerel_DATA = \
 	keymaps-force-release/hp-other \
 	keymaps-force-release/samsung-other \
 	keymaps-force-release/samsung-series-9 \
+	keymaps-force-release/samsung-series-3 \
 	keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: Makefile
@@ -2639,6 +2669,7 @@ libsystemd_id128_la_LDFLAGS = \
 
 libsystemd_id128_la_LIBADD = \
 	libsystemd-shared.la \
+	libsystemd-label.la \
 	libsystemd-daemon-internal.la
 
 libsystemd_id128_internal_la_SOURCES = \