update fixme

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 07204a9f0f1175df22cebe1af39a4ddf09738bd1..536cabb37dd96365330e3a8e9aa627a848dae3a2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,8 @@ rootlibexec_PROGRAMS = \
        systemd-initctl \
        systemd-update-utmp \
        systemd-random-seed \
-       systemd-shutdownd
+       systemd-shutdownd \
+       systemd-auto-console-getty
 
 noinst_PROGRAMS = \
        test-engine \
@@ -139,6 +140,7 @@ dist_systemunit_DATA = \
        units/systemd-initctl.socket \
        units/systemd-logger.socket \
        units/systemd-shutdownd.socket \
+       units/systemd-auto-console-getty.service \
        units/dev-hugepages.automount \
        units/dev-hugepages.mount \
        units/dev-mqueue.automount \
@@ -149,8 +151,11 @@ 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/printer.target \
        units/bluetooth.target \
        units/smartcard.target
@@ -164,6 +169,7 @@ nodist_systemunit_DATA = \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
+       units/systemd-auto-console-getty.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
        units/systemd-random-seed-save.service \
@@ -186,6 +192,7 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
+       units/systemd-auto-console-getty.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
        units/systemd-random-seed-save.service.in \
@@ -306,7 +313,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 \
@@ -535,6 +541,7 @@ systemd_random_seed_LDADD = \
        libsystemd-basic.la
 
 systemd_shutdownd_SOURCES = \
+       src/utmp-wtmp.c \
        src/sd-daemon.c \
        src/shutdownd.c
 
@@ -544,6 +551,18 @@ systemd_shutdownd_CFLAGS = \
 systemd_shutdownd_LDADD = \
        libsystemd-basic.la
 
+systemd_auto_console_getty_SOURCES = \
+       src/auto-console-getty.c \
+       src/dbus-common.c
+
+systemd_auto_console_getty_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_auto_console_getty_LDADD = \
+       libsystemd-basic.la \
+       $(DBUS_LIBS)
+
 systemd_cgroups_agent_SOURCES = \
        src/cgroups-agent.c \
        src/dbus-common.c
@@ -779,9 +798,10 @@ install-data-hook:
                rm -f session && \
                $(LN_S) $(pkgsysconfdir)/session session )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-logger.socket && \
+               rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket && \
                $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
-               $(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
+               $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
+               $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
        ( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
                rm -f systemd-update-utmp-runlevel.service && \
                $(LN_S) ../systemd-update-utmp-runlevel.service )
@@ -823,13 +843,14 @@ install-data-hook:
                $(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \
                $(LN_S) $(systemunitdir)/rescue.target kbrequest.target )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-               rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
+               rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service systemd-auto-console-getty.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty2.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty3.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
+               $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service && \
+               $(LN_S) $(systemunitdir)/systemd-auto-console-getty.service systemd-auto-console-getty.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f getty.target remote-fs.target && \
                $(LN_S) $(systemunitdir)/getty.target getty.target && \