automount: order automount units after fsck, too

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4dcecc5c7f7239e8c8a66aa9cb5065a284d27b8c..3c54043975133efb0eb1808be19043d54e0f0f61 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,6 @@ rootbin_PROGRAMS = \
        systemd-notify
 
 bin_PROGRAMS = \
-       systemd-install \
        systemd-cgls
 
 if HAVE_GTK
@@ -196,7 +195,8 @@ 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
@@ -298,7 +298,8 @@ libsystemd_core_la_LIBADD = \
        $(DBUS_LIBS) \
        $(UDEV_LIBS) \
        $(LIBWRAP_LIBS) \
-       $(PAM_LIBS)
+       $(PAM_LIBS) \
+       $(SELINUX_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
@@ -324,7 +325,6 @@ MANPAGES = \
        man/systemd.1 \
        man/systemctl.1 \
        man/systemadm.1 \
-       man/systemd-install.1 \
        man/systemd-cgls.1 \
        man/systemd-notify.1 \
        man/sd_notify.3 \
@@ -493,6 +493,8 @@ systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
        src/dbus-common.c \
+       src/path-lookup.c \
+       src/sd-daemon.c \
        src/cgroup-show.c \
        src/cgroup-util.c
 
@@ -511,20 +513,6 @@ systemd_notify_SOURCES = \
 systemd_notify_LDADD = \
        libsystemd-basic.la
 
-systemd_install_SOURCES = \
-       src/install.c \
-       src/path-lookup.c \
-       src/dbus-common.c \
-       src/sd-daemon.c
-
-systemd_install_LDADD = \
-       libsystemd-basic.la \
-       $(DBUS_LIBS)
-
-systemd_install_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_cgls_SOURCES = \
        src/cgls.c \
        src/cgroup-show.c \
@@ -800,6 +788,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) \