chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update fixme
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index abd07eb7ec0d4d2b645758f7e2d99945c8d19910..de85b7979021ae080657b3f05f9925dd48a3be21 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ AM_CPPFLAGS = \
        -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DRUNTIME_DIR=\"$(localstatedir)/run\" \
+       -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
        -I $(top_srcdir)/src
 
 rootbin_PROGRAMS = \
@@ -69,7 +70,10 @@ rootlibexec_PROGRAMS = \
        systemd-logger \
        systemd-cgroups-agent \
        systemd-initctl \
-       systemd-update-utmp
+       systemd-update-utmp \
+       systemd-random-seed \
+       systemd-shutdownd \
+       systemd-auto-console-getty
 
 noinst_PROGRAMS = \
        test-engine \
@@ -135,6 +139,8 @@ dist_systemunit_DATA = \
        units/dbus.target \
        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 \
@@ -159,8 +165,12 @@ nodist_systemunit_DATA = \
        units/multi-user.target \
        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 \
+       units/systemd-random-seed-load.service \
        units/syslog.target
 
 dist_sessionunit_DATA = \
@@ -178,8 +188,12 @@ EXTRA_DIST = \
        units/remote-fs.target.m4 \
        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 \
+       units/systemd-random-seed-load.service.in \
        units/syslog.target.in \
        units/session/exit.service.in \
        systemd.pc.in
@@ -195,7 +209,9 @@ dist_systemunit_DATA += \
        units/fedora/sysinit.service \
        units/fedora/single.service \
        units/fedora/plymouth-quit.service \
-       units/fedora/plymouth-shutdown.service
+       units/fedora/plymouth-reboot.service \
+       units/fedora/plymouth-poweroff.service \
+       units/fedora/plymouth-halt.service
 endif
 
 if TARGET_SUSE
@@ -337,7 +353,9 @@ EXTRA_DIST += \
        src/dbus-common.h \
        src/bus-errors.h \
        src/cgroup-show.h \
-       src/utmp-wtmp.h
+       src/utmp-wtmp.h \
+       src/build.h \
+       src/shutdownd.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -511,6 +529,38 @@ systemd_update_utmp_LDADD = \
        $(DBUS_LIBS) \
        $(AUDIT_LIBS)
 
+systemd_random_seed_SOURCES = \
+       src/random-seed.c
+
+systemd_random_seed_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_random_seed_LDADD = \
+       libsystemd-basic.la
+
+systemd_shutdownd_SOURCES = \
+       src/utmp-wtmp.c \
+       src/sd-daemon.c \
+       src/shutdownd.c
+
+systemd_shutdownd_CFLAGS = \
+       $(AM_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
@@ -746,9 +796,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 )
@@ -776,28 +827,28 @@ install-data-hook:
                $(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
                $(LN_S) $(systemunitdir)/printer.target printer.target)
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f runlevel0.target runlevel1.target runlevel6.target && \
+               rm -f runlevel0.target runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target runlevel6.target && \
                $(LN_S) poweroff.target runlevel0.target && \
                $(LN_S) rescue.target runlevel1.target && \
+               $(LN_S) multi-user.target runlevel2.target && \
+               $(LN_S) multi-user.target runlevel3.target && \
+               $(LN_S) multi-user.target runlevel4.target && \
+               $(LN_S) graphical.target runlevel5.target && \
                $(LN_S) reboot.target runlevel6.target )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
                rm -f default.target ctrl-alt-del.target kbrequest.target && \
                $(LN_S) $(systemunitdir)/graphical.target default.target && \
                $(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \
-               $(LN_S) $(systemunitdir)/rescue.target kbrequest.target && \
-               rm -f runlevel2.target runlevel3.target runlevel4.target runlevel5.target && \
-               $(LN_S) $(systemunitdir)/multi-user.target runlevel2.target && \
-               $(LN_S) $(systemunitdir)/multi-user.target runlevel3.target && \
-               $(LN_S) $(systemunitdir)/multi-user.target runlevel4.target && \
-               $(LN_S) $(systemunitdir)/graphical.target runlevel5.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 && \
@@ -819,8 +870,11 @@ install-data-hook:
 if TARGET_FEDORA
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
-               $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants \
-               $(DESTDIR)$(systemunitdir)/rescue.target.wants
+               $(DESTDIR)$(systemunitdir)/reboot.target.wants \
+               $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
+               $(DESTDIR)$(systemunitdir)/halt.target.wants \
+               $(DESTDIR)$(systemunitdir)/rescue.target.wants \
+               $(DESTDIR)$(systemunitdir)/multi-user.target.wants
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@@ -828,15 +882,23 @@ if TARGET_FEDORA
                rm -f prefdm.service && \
                $(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-               rm -f rc-local.service plymouth-quit.service && \
-               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service && \
-               $(LN_S) $(systemunitdir)/plymouth-quit.service plymouth-quit.service )
+               rm -f rc-local.service && \
+               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
        ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
                rm -f single.service && \
                $(LN_S) $(systemunitdir)/single.service single.service )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants && \
-               rm -f plymouth-shutdown.service && \
-               $(LN_S) $(systemunitdir)/plymouth-shutdown.service plymouth-shutdown.service )
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f plymouth-quit.service && \
+               $(LN_S) ../plymouth-quit.service plymouth-quit.service )
+       ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
+               rm -f plymouth-reboot.service && \
+               $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
+       ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
+               rm -f plymouth-poweroff.service && \
+               $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
+       ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
+               rm -f plymouth-halt.service && \
+               $(LN_S) ../plymouth-halt.service plymouth-halt.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )
Unnamed repository; edit this file 'description' to name the repository.