units: enable mount units by default and hook binary units into base.target instead...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0ac6b1acea4d7dac552dd1a4fabeb8ab06bf204a..6b306073a839b65ae5860e39fe3d756f2cd899d0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,7 +92,10 @@ rootlibexec_PROGRAMS = \
        systemd-remount-api-vfs \
        systemd-kmsg-syslogd \
        systemd-vconsole-setup \
-       systemd-reply-password
+       systemd-reply-password \
+       systemd-readahead-collect \
+       systemd-readahead-replay \
+       systemd-tempfiles
 
 noinst_PROGRAMS = \
        test-engine \
@@ -419,6 +422,7 @@ MANPAGES = \
        man/systemd-cgls.1 \
        man/systemd-notify.1 \
        man/sd_notify.3 \
+       man/sd_readahead.3 \
        man/sd_booted.3 \
        man/sd_listen_fds.3 \
        man/sd_is_fifo.3 \
@@ -617,6 +621,15 @@ systemd_modules_load_SOURCES = \
 systemd_modules_load_CFLAGS = \
        $(AM_CFLAGS)
 
+systemd_tempfiles_LDADD = \
+       libsystemd-basic.la
+
+systemd_tempfiles_SOURCES = \
+       src/tempfiles.c
+
+systemd_tempfiles_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemd_modules_load_LDADD = \
        libsystemd-basic.la
 
@@ -699,6 +712,30 @@ systemd_reply_password_SOURCES = \
 systemd_reply_password_LDADD = \
        libsystemd-basic.la
 
+systemd_readahead_collect_SOURCES = \
+       src/readahead-collect.c \
+       src/sd-daemon.c \
+       src/readahead-common.c
+
+systemd_readahead_collect_CFLAGS = \
+       $(UDEV_CFLAGS)
+
+systemd_readahead_collect_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS)
+
+systemd_readahead_replay_SOURCES = \
+       src/readahead-replay.c \
+       src/sd-daemon.c \
+       src/readahead-common.c
+
+systemd_readahead_replay_CFLAGS = \
+       $(UDEV_CFLAGS)
+
+systemd_readahead_replay_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS)
+
 systemd_cgls_SOURCES = \
        src/cgls.c \
        src/cgroup-show.c \
@@ -904,7 +941,7 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(sessionunitdir) \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
-               $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
+               $(DESTDIR)$(systemunitdir)/basic.target.wants \
                $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
                $(DESTDIR)$(systemunitdir)/local-fs.target.wants \
                $(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
@@ -950,10 +987,17 @@ install-data-hook:
                $(LN_S) ../hwclock-save.service hwclock-save.service && \
                $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-               rm -f systemd-update-utmp-shutdown.service \
+               rm -f systemd-remount-api-vfs.service \
+                       remount-rootfs.service \
+                       var-run.mount \
                        var-run.service \
+                       var-lock.mount \
                        var-lock.service && \
+               $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+               $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
+               $(LN_S) ../var-run.mount var-run.mount && \
                $(LN_S) ../var-run.service var-run.service && \
+               $(LN_S) ../var-lock.mount var-lock.mount && \
                $(LN_S) ../var-lock.service var-lock.service )
        ( cd $(DESTDIR)$(sessionunitdir) && \
                rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
@@ -990,7 +1034,7 @@ install-data-hook:
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
-       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+       ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f dev-hugepages.automount \
                        dev-mqueue.automount \
                        proc-sys-fs-binfmt_misc.automount \
@@ -1098,3 +1142,11 @@ upload: all distcheck
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+# Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
+fedora: install
+       rm /lib/systemd/system/local-fs.target.wants/var-run.service
+       rm /lib/systemd/system/local-fs.target.wants/var-run.mount
+       rm /lib/systemd/system/local-fs.target.wants/var-lock.service
+       rm /lib/systemd/system/local-fs.target.wants/var-lock.mount
+       rm /lib/systemd/system/local-fs.target.wants/remount-rootfs.service