console: rework automatic getty on kernel console logic again

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e3cef517cc00861efe6a8ca17b3f4ed525cdec7b..ed37278d33ed2d7068fbaf1306d9cdff8ff35abf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,13 +72,17 @@ rootlibexec_PROGRAMS = \
        systemd-initctl \
        systemd-update-utmp \
        systemd-random-seed \
-       systemd-shutdownd
+       systemd-shutdownd \
+       systemd-modules-load \
+       systemd-remount-api-vfs \
+       systemd-kmsg-syslogd
 
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
        test-ns \
        test-loopback \
+       test-hostname \
        test-daemon \
        test-cgroup \
        test-env-replace
@@ -139,6 +143,7 @@ dist_systemunit_DATA = \
        units/systemd-initctl.socket \
        units/systemd-logger.socket \
        units/systemd-shutdownd.socket \
+       units/systemd-kmsg-syslogd.socket \
        units/dev-hugepages.automount \
        units/dev-hugepages.mount \
        units/dev-mqueue.automount \
@@ -149,8 +154,15 @@ dist_systemunit_DATA = \
        units/sys-kernel-debug.mount \
        units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
+       units/tmp.mount \
        units/var-lock.mount \
+       units/var-lock.service \
        units/var-run.mount \
+       units/var-run.service \
+       units/hwclock-load.service \
+       units/hwclock-save.service \
+       units/sysctl.service \
+       units/remount-rootfs.service \
        units/printer.target \
        units/bluetooth.target \
        units/smartcard.target
@@ -158,12 +170,16 @@ dist_systemunit_DATA = \
 nodist_systemunit_DATA = \
        units/sysinit.target \
        units/getty@.service \
+       units/serial-getty@.service \
        units/graphical.target \
        units/remote-fs.target \
        units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
+       units/systemd-kmsg-syslogd.service \
+       units/systemd-modules-load.service \
+       units/systemd-remount-api-vfs.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
        units/systemd-random-seed-save.service \
@@ -180,12 +196,16 @@ nodist_sessionunit_DATA = \
 EXTRA_DIST = \
        units/sysinit.target.m4 \
        units/getty@.service.m4 \
+       units/serial-getty@.service.m4 \
        units/graphical.target.m4 \
        units/multi-user.target.m4 \
        units/remote-fs.target.m4 \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
+       units/systemd-kmsg-syslogd.service.in \
+       units/systemd-modules-load.service.in \
+       units/systemd-remount-api-vfs.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
        units/systemd-random-seed-save.service.in \
@@ -286,6 +306,7 @@ libsystemd_core_la_SOURCES = \
        src/path.c \
         src/load-dropin.c \
         src/execute.c \
+       src/exit-status.c \
         src/dbus.c \
         src/dbus-manager.c \
         src/dbus-unit.c \
@@ -306,7 +327,6 @@ libsystemd_core_la_SOURCES = \
        src/hostname-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
-       src/modprobe-setup.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
@@ -462,6 +482,13 @@ test_loopback_SOURCES = \
 test_loopback_LDADD = \
        libsystemd-basic.la
 
+test_hostname_SOURCES = \
+       src/test-hostname.c \
+       src/hostname-setup.c
+
+test_hostname_LDADD = \
+       libsystemd-basic.la
+
 test_daemon_SOURCES = \
        src/test-daemon.c \
        src/sd-daemon.c
@@ -535,6 +562,7 @@ systemd_random_seed_LDADD = \
        libsystemd-basic.la
 
 systemd_shutdownd_SOURCES = \
+       src/utmp-wtmp.c \
        src/sd-daemon.c \
        src/shutdownd.c
 
@@ -544,6 +572,25 @@ systemd_shutdownd_CFLAGS = \
 systemd_shutdownd_LDADD = \
        libsystemd-basic.la
 
+systemd_modules_load_SOURCES = \
+       src/modules-load.c
+
+systemd_modules_load_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_modules_load_LDADD = \
+       libsystemd-basic.la
+
+systemd_remount_api_vfs_SOURCES = \
+       src/remount-api-vfs.c \
+       src/mount-setup.c
+
+systemd_remount_api_vfs_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_remount_api_vfs_LDADD = \
+       libsystemd-basic.la
+
 systemd_cgroups_agent_SOURCES = \
        src/cgroups-agent.c \
        src/dbus-common.c
@@ -556,6 +603,17 @@ systemd_cgroups_agent_LDADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS)
 
+systemd_kmsg_syslogd_SOURCES = \
+       src/kmsg-syslogd.c \
+       src/sd-daemon.c \
+       src/fdset.c
+
+systemd_kmsg_syslogd_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_kmsg_syslogd_LDADD = \
+       libsystemd-basic.la
+
 systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
@@ -563,7 +621,8 @@ systemctl_SOURCES = \
        src/path-lookup.c \
        src/sd-daemon.c \
        src/cgroup-show.c \
-       src/cgroup-util.c
+       src/cgroup-util.c \
+       src/exit-status.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -773,8 +832,6 @@ install-data-hook:
                $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/session \
                $(DESTDIR)$(sysconfdir)/xdg/systemd
-       $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup || \
-               echo "Don't forget to create /cgroup! Couldn't create it for you, continuing anyway."
        ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
                rm -f session && \
                $(LN_S) $(pkgsysconfdir)/session session )