readahead-collect: typo, free the correct pointer

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d233da6ca58dba54e9ad5f807589990f893f5787..2cd3debf83934d11ba00a26367b41c8d8b15b62c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,7 +92,9 @@ rootlibexec_PROGRAMS = \
        systemd-remount-api-vfs \
        systemd-kmsg-syslogd \
        systemd-vconsole-setup \
-       systemd-reply-password
+       systemd-reply-password \
+       systemd-readahead-collect \
+       systemd-readahead-replay
 
 noinst_PROGRAMS = \
        test-engine \
@@ -173,6 +175,7 @@ dist_systemunit_DATA = \
        units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
        units/tmp.mount \
+       units/tmp.service \
        units/var-lock.mount \
        units/var-lock.service \
        units/var-run.mount \
@@ -698,6 +701,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 \
@@ -905,11 +932,13 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
                $(DESTDIR)$(systemunitdir)/sysinit.target.wants \
                $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+               $(DESTDIR)$(systemunitdir)/local-fs.target.wants \
                $(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
                $(DESTDIR)$(systemunitdir)/runlevel2.target.wants \
                $(DESTDIR)$(systemunitdir)/runlevel3.target.wants \
                $(DESTDIR)$(systemunitdir)/runlevel4.target.wants \
                $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
+               $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
                $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
@@ -926,26 +955,32 @@ install-data-hook:
                $(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 )
+               $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
        ( cd $(DESTDIR)$(systemunitdir)/runlevel2.target.wants && \
                rm -f systemd-update-utmp-runlevel.service && \
-               $(LN_S) ../systemd-update-utmp-runlevel.service )
+               $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
        ( cd $(DESTDIR)$(systemunitdir)/runlevel3.target.wants && \
                rm -f systemd-update-utmp-runlevel.service && \
-               $(LN_S) ../systemd-update-utmp-runlevel.service )
+               $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
        ( cd $(DESTDIR)$(systemunitdir)/runlevel4.target.wants && \
                rm -f systemd-update-utmp-runlevel.service && \
-               $(LN_S) ../systemd-update-utmp-runlevel.service )
+               $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
        ( cd $(DESTDIR)$(systemunitdir)/runlevel5.target.wants && \
                rm -f systemd-update-utmp-runlevel.service && \
-               $(LN_S) ../systemd-update-utmp-runlevel.service )
+               $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
        ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
                rm -f systemd-update-utmp-shutdown.service \
                        hwclock-save.service \
                        systemd-random-seed-save.service && \
-               $(LN_S) ../systemd-update-utmp-shutdown.service && \
-               $(LN_S) ../hwclock-save.service && \
-               $(LN_S) ../systemd-random-seed-save.service )
+               $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service && \
+               $(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 \
+                       var-run.service \
+                       var-lock.service && \
+               $(LN_S) ../var-run.service var-run.service && \
+               $(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 && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -963,11 +998,13 @@ install-data-hook:
                $(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 )
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f default.target ctrl-alt-del.target && \
+               $(LN_S) graphical.target default.target && \
+               $(LN_S) reboot.target ctrl-alt-del.target )
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f getty.target && \
+               $(LN_S) ../getty.target getty.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 && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
@@ -977,8 +1014,7 @@ install-data-hook:
                $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
-               rm -f getty.target remote-fs.target && \
-               $(LN_S) $(systemunitdir)/getty.target getty.target && \
+               rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f dev-hugepages.automount \
@@ -989,7 +1025,6 @@ install-data-hook:
                        systemd-vconsole-setup.service \
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
-                       hwclock-load.service \
                        sysctl.service \
                        tmpwatch.timer \
                        tmpwatch.service && \
@@ -998,13 +1033,12 @@ install-data-hook:
                $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
                $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
                $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
-               $(LN_S) ../systemd-vconsole-setup.service && \
-               $(LN_S) ../systemd-modules-load.service && \
-               $(LN_S) ../systemd-random-seed-load.service && \
-               $(LN_S) ../hwclock-load.service && \
-               $(LN_S) ../sysctl.service && \
-               $(LN_S) ../tmpwatch.timer && \
-               $(LN_S) ../tmpwatch.service )
+               $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
+               $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
+               $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
+               $(LN_S) ../sysctl.service sysctl.service && \
+               $(LN_S) ../tmpwatch.timer tmpwatch.timer && \
+               $(LN_S) ../tmpwatch.service tmpwatch.service )
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )