cgroup: don't recheck all the time whether the systemd hierarchy is mounted, to make...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a2e40c3fd1748eab52f3ba1c143b6a0111e025c8..f7b7053d836d27828885a718d7564a9a7095fd34 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -143,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
 
@@ -260,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 \
@@ -304,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 \
@@ -514,6 +519,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 \
@@ -854,6 +860,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
@@ -983,13 +999,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