X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=97c8be35ee039f21f30a53e12538ae7074fb1209;hb=72fe22f93059ec6bbc9c9da0171e3be9d8b1c9ce;hp=bb6485792aea13e1b0a60eec66220d7825f66a84;hpb=25705583af79130d2692de297ac971f3cf165619;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index bb6485792..97c8be35e 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 \
@@ -340,7 +341,7 @@ EXTRA_DIST = \
 	units/quotacheck.service.in \
 	systemd.pc.in \
 	introspect.awk \
-        src/org.freedesktop.systemd1.policy.in
+	src/org.freedesktop.systemd1.policy.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -983,6 +984,15 @@ systemd_cgls_CFLAGS = \
 systemd_cgls_LDADD = \
 	libsystemd-basic.la
 
+systemd_nspawn_SOURCES = \
+	src/nspawn.c
+
+systemd_nspawn_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_nspawn_LDADD = \
+	libsystemd-basic.la
+
 systemd_stdio_bridge_SOURCES = \
 	src/bridge.c
 
@@ -1114,7 +1124,8 @@ CLEANFILES = \
 	$(nodist_userunit_DATA) \
 	$(nodist_man_MANS) \
 	${XML_IN_FILES:.xml.in=.html} \
-	$(pkgconfigdata_DATA)
+	$(pkgconfigdata_DATA) \
+	src/org.freedesktop.systemd1.policy
 
 if HAVE_VALAC
 CLEANFILES += \