units: split fsck.target from sysinit.target for suse compat

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 51fe5a946139c47d7e6461f131de357c0339fdb6..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
@@ -77,7 +76,8 @@ noinst_PROGRAMS = \
        test-ns \
        test-loopback \
        test-daemon \
-       test-cgroup
+       test-cgroup \
+       test-env-replace
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -145,7 +145,10 @@ dist_systemunit_DATA = \
        units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
        units/var-lock.mount \
-       units/var-run.mount
+       units/var-run.mount \
+       units/printer.target \
+       units/bluetooth.target \
+       units/smartcard.target
 
 nodist_systemunit_DATA = \
        units/sysinit.target \
@@ -192,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
@@ -294,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
@@ -320,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 \
@@ -443,6 +447,15 @@ test_cgroup_CFLAGS = \
 test_cgroup_LDADD = \
        libsystemd-basic.la
 
+test_env_replace_SOURCES = \
+       src/test-env-replace.c
+
+test_env_replace_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_env_replace_LDADD = \
+       libsystemd-basic.la
+
 systemd_logger_SOURCES = \
        src/logger.c \
        src/sd-daemon.c \
@@ -480,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
 
@@ -498,22 +513,8 @@ 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/systemd-cgls.c \
+       src/cgls.c \
        src/cgroup-show.c \
        src/cgroup-util.c
 
@@ -709,11 +710,13 @@ install-data-hook:
                $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
        ( cd $(DESTDIR)$(sessionunitdir) && \
-               rm -f shutdown.target sockets.target local-fs.target swap.target && \
+               rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
                $(LN_S) $(systemunitdir)/sockets.target sockets.target && \
                $(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
-               $(LN_S) $(systemunitdir)/swap.target swap.target )
+               $(LN_S) $(systemunitdir)/swap.target swap.target && \
+               $(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 && \
                $(LN_S) poweroff.target runlevel0.target && \
@@ -785,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) \