X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3bac47849e18f70e169148b93934210ab29bffaa;hp=7d6cfd12d87bb2de1df465b83ea108e291d3db6a;hb=196e3fa74a88a04b0ecec7d3af648287dd088f8a;hpb=88213476187cafc86bea2276199891873000588d

diff --git a/Makefile.am b/Makefile.am
index 7d6cfd12d..3bac47849 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,16 +106,12 @@ 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
-
-sbin_PROGRAMS = \
+	systemd-stdio-bridge \
         systemd-nspawn
 
 if HAVE_GTK
@@ -147,11 +143,14 @@ rootlibexec_PROGRAMS = \
 	systemd-detect-virt \
 	systemd-sysctl
 
+systemgenerator_PROGRAMS = \
+        systemd-getty-generator
+
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
 	systemd-cryptsetup
 
-systemgenerator_PROGRAMS = \
+systemgenerator_PROGRAMS += \
 	systemd-cryptsetup-generator
 endif
 
@@ -264,6 +263,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 \
@@ -308,6 +308,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 \
@@ -359,6 +360,11 @@ dist_systemunit_DATA += \
 	units/fedora/halt-local.service
 endif
 
+if TARGET_FRUGALWARE
+dist_systemunit_DATA += \
+	units/frugalware/display-manager.service
+endif
+
 if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
 	units/plymouth-start.service \
@@ -518,6 +524,7 @@ MANPAGES = \
 	man/systemctl.1 \
 	man/systemadm.1 \
 	man/systemd-cgls.1 \
+	man/systemd-nspawn.1 \
 	man/systemd-tmpfiles.8 \
 	man/systemd-notify.1 \
 	man/sd_notify.3 \
@@ -858,6 +865,16 @@ systemd_cryptsetup_generator_CFLAGS = \
 systemd_cryptsetup_generator_LDADD = \
 	libsystemd-basic.la
 
+systemd_getty_generator_SOURCES = \
+	src/getty-generator.c \
+	src/unit-name.c
+
+systemd_getty_generator_CFLAGS = \
+	$(AM_CFLAGS)
+
+systemd_getty_generator_LDADD = \
+	libsystemd-basic.la
+
 systemd_user_sessions_SOURCES = \
 	src/user-sessions.c \
 	src/cgroup-util.c
@@ -987,13 +1004,15 @@ systemd_cgls_LDADD = \
 	libsystemd-basic.la
 
 systemd_nspawn_SOURCES = \
-	src/nspawn.c
+	src/nspawn.c \
+	src/cgroup-util.c
 
 systemd_nspawn_CFLAGS = \
 	$(AM_CFLAGS)
 
 systemd_nspawn_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	libsystemd-daemon.la
 
 systemd_stdio_bridge_SOURCES = \
 	src/bridge.c