update fixme

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f129525f2e944ddfb31283e24f92bb87d4c25c8a..5fcf24f5de75c821a508958bd48e9c5e670dcc19 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -108,7 +108,9 @@ rootlibexec_PROGRAMS = \
        systemd-readahead-collect \
        systemd-readahead-replay \
        systemd-tmpfiles \
-       systemd-user-sessions
+       systemd-user-sessions \
+       systemd-fsck \
+       systemd-quotacheck
 
 noinst_PROGRAMS = \
        test-engine \
@@ -183,7 +185,7 @@ dist_systemunit_DATA = \
        units/systemd-initctl.socket \
        units/systemd-logger.socket \
        units/systemd-shutdownd.socket \
-       units/systemd-kmsg-syslogd.socket \
+       units/syslog.socket \
        units/dev-hugepages.automount \
        units/dev-hugepages.mount \
        units/dev-mqueue.automount \
@@ -204,9 +206,9 @@ dist_systemunit_DATA = \
        units/printer.target \
        units/bluetooth.target \
        units/smartcard.target \
-       units/tmpwatch.service \
-       units/tmpwatch.timer \
-       units/systemd-readahead-done.timer
+       units/systemd-readahead-done.timer \
+       units/systemd-tmpfiles-clean.timer \
+       units/quotaon.service
 
 nodist_systemunit_DATA = \
        units/sysinit.target \
@@ -229,13 +231,17 @@ nodist_systemunit_DATA = \
        units/systemd-readahead-collect.service \
        units/systemd-readahead-replay.service \
        units/systemd-readahead-done.service \
-       units/systemd-tmpfiles.service \
+       units/systemd-tmpfiles-setup.service \
+       units/systemd-tmpfiles-clean.service \
        units/systemd-user-sessions.service \
        units/syslog.target \
        units/halt.service \
        units/poweroff.service \
        units/reboot.service \
-       units/kexec.service
+       units/kexec.service \
+       units/fsck@.service \
+       units/fsck-root.service \
+       units/quotacheck.service
 
 dist_sessionunit_DATA = \
        units/session/default.target \
@@ -266,7 +272,8 @@ EXTRA_DIST = \
        units/systemd-readahead-collect.service.in \
        units/systemd-readahead-replay.service.in \
        units/systemd-readahead-done.service.in \
-       units/systemd-tmpfiles.service.in \
+       units/systemd-tmpfiles-setup.service.in \
+       units/systemd-tmpfiles-clean.service.in \
        units/systemd-user-sessions.service.in \
        units/syslog.target.in \
        units/halt.service.in \
@@ -274,6 +281,9 @@ EXTRA_DIST = \
        units/reboot.service.in \
        units/kexec.service.in \
        units/session/exit.service.in \
+       units/fsck@.service.in \
+       units/fsck-root.service.in \
+       units/quotacheck.service.in \
        systemd.pc.in
 
 if TARGET_FEDORA
@@ -661,7 +671,7 @@ systemd_modules_load_SOURCES = \
 systemd_modules_load_CFLAGS = \
        $(AM_CFLAGS)
 
-systemd_tmpfiles_LDADD = \
+systemd_modules_load_LDADD = \
        libsystemd-basic.la
 
 systemd_tmpfiles_SOURCES = \
@@ -670,7 +680,30 @@ systemd_tmpfiles_SOURCES = \
 systemd_tmpfiles_CFLAGS = \
        $(AM_CFLAGS)
 
-systemd_user_sessions_LDADD = \
+systemd_tmpfiles_LDADD = \
+       libsystemd-basic.la
+
+systemd_fsck_SOURCES = \
+       src/fsck.c \
+       src/dbus-common.c
+
+systemd_fsck_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_fsck_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS) \
+       $(DBUS_LIBS)
+
+systemd_quotacheck_SOURCES = \
+       src/quotacheck.c
+
+systemd_quotacheck_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_quotacheck_LDADD = \
        libsystemd-basic.la
 
 systemd_user_sessions_SOURCES = \
@@ -680,7 +713,7 @@ systemd_user_sessions_SOURCES = \
 systemd_user_sessions_CFLAGS = \
        $(AM_CFLAGS)
 
-systemd_modules_load_LDADD = \
+systemd_user_sessions_LDADD = \
        libsystemd-basic.la
 
 systemd_vconsole_setup_SOURCES = \
@@ -1004,19 +1037,22 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir)/runlevel5.target.wants \
                $(DESTDIR)$(systemunitdir)/multi-user.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
-               $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
+               $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants \
+               $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
+               $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/session \
                $(DESTDIR)$(sysconfdir)/xdg/systemd
        ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
                rm -f session && \
                $(LN_S) $(pkgsysconfdir)/session session )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket && \
+               rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
                $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
-               $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
+               $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
+               $(LN_S) ../syslog.socket syslog.socket )
        ( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
                rm -f systemd-update-utmp-runlevel.service && \
                $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
@@ -1041,10 +1077,12 @@ install-data-hook:
                $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f systemd-remount-api-vfs.service \
+                       fsck-root.service \
                        remount-rootfs.service \
                        var-run.mount \
                        var-lock.mount && \
                $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
+               $(LN_S) ../fsck-root.service fsck-root.service && \
                $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
                $(LN_S) ../var-run.mount var-run.mount && \
                $(LN_S) ../var-lock.mount var-lock.mount )
@@ -1081,9 +1119,16 @@ install-data-hook:
                $(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
+               rm -f quotaon.service quotacheck.service && \
+               $(LN_S) $(systemunitdir)/quotacheck.service quotacheck.service && \
+               $(LN_S) $(systemunitdir)/quotaon.service quotaon.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
+       ( cd $(DESTDIR)$(pkgsysconfdir)/system/basic.target.wants && \
+               rm -f hwclock-load.service && \
+               $(LN_S) $(systemunitdir)/hwclock-load.service hwclock-load.service )
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f dev-hugepages.automount \
                        dev-mqueue.automount \
@@ -1093,10 +1138,9 @@ install-data-hook:
                        systemd-vconsole-setup.service \
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
-                       systemd-tmpfiles.service \
+                       systemd-tmpfiles-setup.service \
                        sysctl.service \
-                       tmpwatch.timer \
-                       tmpwatch.service && \
+                       systemd-tmpfiles-clean.timer && \
                $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
                $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
                $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
@@ -1105,10 +1149,9 @@ install-data-hook:
                $(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) ../systemd-tmpfiles.service systemd-tmpfiles.service && \
+               $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
                $(LN_S) ../sysctl.service sysctl.service && \
-               $(LN_S) ../tmpwatch.timer tmpwatch.timer && \
-               $(LN_S) ../tmpwatch.service tmpwatch.service )
+               $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
        ( cd $(DESTDIR)$(dbussessionservicedir) && \
                rm -f org.freedesktop.systemd1.service && \
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )