unit: make sure a job for a service of type 'finish' succeeds if the process terminat...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bebfd2f7370a9ef35be9218c02a1da9a04605edd..cb2318406da32f9e712286fa1a727a61a0d20f88 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,7 +68,8 @@ endif
 rootlibexec_PROGRAMS = \
        systemd-logger \
        systemd-cgroups-agent \
-       systemd-initctl
+       systemd-initctl \
+       systemd-update-utmp
 
 noinst_PROGRAMS = \
        test-engine \
@@ -188,14 +189,17 @@ dist_systemunit_DATA += \
        units/fedora/rc-local.service \
        units/fedora/reboot.service \
        units/fedora/sysinit.service \
-       units/fedora/single.service
+       units/fedora/single.service \
+       units/fedora/plymouth-quit.service \
+       units/fedora/plymouth-shutdown.service
 endif
 
 if TARGET_SUSE
 dist_systemunit_DATA += \
        units/suse/halt.service \
        units/suse/poweroff.service \
-       units/suse/reboot.service
+       units/suse/reboot.service \
+       units/suse/fsck.target
 endif
 
 if TARGET_GENTOO
@@ -240,6 +244,13 @@ libsystemd_basic_la_SOURCES = \
         src/log.c \
         src/ratelimit.c
 
+libsystemd_basic_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(SELINUX_CFLAGS)
+
+libsystemd_basic_la_LIBADD = \
+       $(SELINUX_LIBS)
+
 libsystemd_core_la_SOURCES = \
        src/unit.c \
         src/job.c \
@@ -279,7 +290,6 @@ libsystemd_core_la_SOURCES = \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/modprobe-setup.c \
-       src/utmp-wtmp.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
@@ -290,7 +300,10 @@ libsystemd_core_la_SOURCES = \
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS)
+       $(UDEV_CFLAGS) \
+       $(LIBWRAP_CFLAGS) \
+       $(PAM_CFLAGS) \
+       $(AUDIT_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
        libsystemd-basic.la \
@@ -298,7 +311,7 @@ libsystemd_core_la_LIBADD = \
        $(UDEV_LIBS) \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
-       $(SELINUX_LIBS)
+       $(AUDIT_LIBS)
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't
@@ -477,8 +490,24 @@ systemd_initctl_LDADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS)
 
+systemd_update_utmp_SOURCES = \
+       src/update-utmp.c \
+       src/dbus-common.c \
+       src/utmp-wtmp.c
+
+systemd_update_utmp_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       $(AUDIT_CFLAGS)
+
+systemd_update_utmp_LDADD = \
+       libsystemd-basic.la \
+       $(DBUS_LIBS) \
+       $(AUDIT_LIBS)
+
 systemd_cgroups_agent_SOURCES = \
-       src/cgroups-agent.c
+       src/cgroups-agent.c \
+       src/dbus-common.c
 
 systemd_cgroups_agent_CFLAGS = \
        $(AM_CFLAGS) \
@@ -760,7 +789,8 @@ install-data-hook:
 if TARGET_FEDORA
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
-               $(DESTDIR)$(systemunitdir)/rescue.target.wants
+               $(DESTDIR)$(systemunitdir)/rescue.target.wants \
+               $(DESTDIR)$(pkgsysconfdir)/system/shutdown.target.wants
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@@ -768,11 +798,15 @@ 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 && \
-               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+               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 )
        ( 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) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )
@@ -787,6 +821,11 @@ if TARGET_GENTOO
                rm -f xdm.service && \
                $(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
+if !TARGET_SUSE
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f fsck.target && \
+               $(LN_S) sysinit.target fsck.target )
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \