X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e0bcfaa3814aa4ff0457aeab0ff6d2543451e16c;hp=016d7dad3264dd226f12edf58785e3b07a21aa97;hb=cda4380d9ffb18f626ba1c146e270e0e664f6739;hpb=ac34b3af131af68e493c3dea071e5aad6eee3ecc

diff --git a/Makefile.am b/Makefile.am
index 016d7dad3..e0bcfaa38 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
@@ -379,6 +380,7 @@ dist_systemunit_DATA = \
 	units/swap.target \
 	units/slices.target \
 	units/system.slice \
+	units/-.slice \
 	units/systemd-initctl.socket \
 	units/systemd-shutdownd.socket \
 	units/syslog.socket \
@@ -880,14 +882,16 @@ libsystemd_core_la_SOURCES = \
 	src/core/dbus-snapshot.h \
 	src/core/dbus-device.c \
 	src/core/dbus-device.h \
-	src/core/dbus-execute.c \
-	src/core/dbus-execute.h \
-	src/core/dbus-kill.c \
-	src/core/dbus-kill.h \
 	src/core/dbus-path.c \
 	src/core/dbus-path.h \
 	src/core/dbus-slice.c \
 	src/core/dbus-slice.h \
+	src/core/dbus-execute.c \
+	src/core/dbus-execute.h \
+	src/core/dbus-kill.c \
+	src/core/dbus-kill.h \
+	src/core/dbus-cgroup.c \
+	src/core/dbus-cgroup.h \
 	src/core/cgroup.c \
 	src/core/cgroup.h \
 	src/core/selinux-access.c \
@@ -914,10 +918,6 @@ libsystemd_core_la_SOURCES = \
 	src/core/namespace.h \
 	src/core/tcpwrap.c \
 	src/core/tcpwrap.h \
-	src/core/cgroup-attr.c \
-	src/core/cgroup-attr.h \
-	src/core/cgroup-semantics.c \
-	src/core/cgroup-semantics.h \
 	src/core/securebits.h \
 	src/core/initreq.h \
 	src/core/special.h \
@@ -1099,7 +1099,8 @@ tests += \
 	test-prioq \
 	test-fileio \
 	test-time \
-	test-hashmap
+	test-hashmap \
+	test-list
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1137,6 +1138,10 @@ test_ns_SOURCES = \
 test_ns_LDADD = \
 	libsystemd-core.la
 
+test_ns_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
 test_loopback_SOURCES = \
 	src/test/test-loopback.c
 
@@ -1199,6 +1204,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
 
@@ -1702,6 +1716,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
@@ -2572,6 +2598,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 \
@@ -2586,6 +2613,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