X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=6104c809d3e8e548609e7f458b59d412c4e22977;hb=04d391dabcd860e2d0542ece1d1c7e0a9d9cd0ac;hp=872bcc255c69177c48d8ac42a833aa8ff0a11060;hpb=3eb4d9a214a09883e50ce557b36c7903406d7ef8;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 872bcc255..6104c809d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,14 +106,13 @@ rootbin_PROGRAMS = \
 	systemd-notify \
 	systemd-ask-password \
 	systemd-tty-ask-password-agent \
-	systemd-tmpfiles
-
-rootsbin_PROGRAMS = \
+	systemd-tmpfiles \
 	systemd-machine-id-setup
 
 bin_PROGRAMS = \
 	systemd-cgls \
-	systemd-stdio-bridge
+	systemd-stdio-bridge \
+        systemd-nspawn
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -261,6 +260,7 @@ dist_systemunit_DATA = \
 nodist_systemunit_DATA = \
 	units/getty@.service \
 	units/serial-getty@.service \
+        units/console-shell.service \
 	units/graphical.target \
 	units/remote-fs.target \
 	units/multi-user.target \
@@ -305,6 +305,7 @@ nodist_userunit_DATA = \
 EXTRA_DIST = \
 	units/getty@.service.m4 \
 	units/serial-getty@.service.m4 \
+        units/console-shell.service.m4 \
 	units/graphical.target.m4 \
 	units/multi-user.target.m4 \
 	units/remote-fs.target.m4 \
@@ -983,6 +984,17 @@ systemd_cgls_CFLAGS = \
 systemd_cgls_LDADD = \
 	libsystemd-basic.la
 
+systemd_nspawn_SOURCES = \
+	src/nspawn.c \
+	src/cgroup-util.c
+
+systemd_nspawn_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_nspawn_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-daemon.la
+
 systemd_stdio_bridge_SOURCES = \
 	src/bridge.c