chiark / gitweb /
load-fragment: a few modernizations
[elogind.git] / Makefile.am
index 276c2265d6b0b747a0b558e89aa53c035d565a69..3b7ec0b7ba24526bbb0bc2b341b4b311b3fed0ff 100644 (file)
@@ -24,28 +24,28 @@ AM_MAKEFLAGS = --no-print-directory
 SUBDIRS = . po
 
 LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
 LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=4
-LIBSYSTEMD_LOGIN_AGE=2
+LIBSYSTEMD_LOGIN_CURRENT=3
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=2
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=5
+LIBSYSTEMD_ID128_REVISION=6
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=1
-LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=1
+LIBSYSTEMD_JOURNAL_CURRENT=2
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=2
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -96,6 +96,7 @@ dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_man_MANS =
 dist_pkgsysconf_DATA =
+dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dbusinterface_DATA =
 dist_dbussystemservice_DATA =
@@ -307,9 +308,8 @@ dist_systemunit_DATA = \
        units/systemd-ask-password-wall.path \
        units/systemd-ask-password-console.path \
        units/syslog.target \
-       units/systemd-udev-control.socket \
-       units/systemd-udev-kernel.socket \
-       units/systemd-timedated-ntp.target  \
+       units/systemd-udevd-control.socket \
+       units/systemd-udevd-kernel.socket \
        units/system-update.target
 
 nodist_systemunit_DATA = \
@@ -328,28 +328,28 @@ nodist_systemunit_DATA = \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
-       units/halt.service \
        units/emergency.service \
-       units/hibernate.service \
-       units/poweroff.service \
-       units/reboot.service \
-       units/kexec.service \
-       units/fsck@.service \
-       units/fsck-root.service \
        units/rescue.service \
-       units/suspend.service \
        units/user@.service \
-       units/systemd-udev.service \
+       units/systemd-hibernate.service \
+       units/systemd-suspend.service \
+       units/systemd-halt.service \
+       units/systemd-poweroff.service \
+       units/systemd-reboot.service \
+       units/systemd-kexec.service \
+       units/systemd-fsck@.service \
+       units/systemd-fsck-root.service \
+       units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
-       units/systemd-debug-shell.service
+       units/debug-shell.service
 
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
 
 nodist_userunit_DATA = \
-       units/user/exit.service
+       units/user/systemd-exit.service
 
 EXTRA_DIST += \
        units/getty@.service.m4 \
@@ -369,20 +369,20 @@ EXTRA_DIST += \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
        units/emergency.service.in \
-       units/halt.service.in \
-       units/poweroff.service.in \
-       units/reboot.service.in \
-       units/kexec.service.in \
-       units/user/exit.service.in \
-       units/fsck@.service.in \
-       units/fsck-root.service.in \
+       units/systemd-halt.service.in \
+       units/systemd-poweroff.service.in \
+       units/systemd-reboot.service.in \
+       units/systemd-kexec.service.in \
+       units/user/systemd-exit.service.in \
+       units/systemd-fsck@.service.in \
+       units/systemd-fsck-root.service.in \
        units/user@.service.in \
-       units/systemd-udev.service \
+       units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
-       units/systemd-debug-shell.service.in \
-       units/hibernate.service.in \
-       units/suspend.service.in \
+       units/debug-shell.service.in \
+       units/systemd-hibernate.service.in \
+       units/systemd-suspend.service.in \
        introspect.awk \
        man/custom-html.xsl
 
@@ -462,6 +462,7 @@ MANPAGES = \
        man/systemd.journal-fields.7 \
        man/kernel-command-line.7 \
        man/daemon.7 \
+       man/bootup.7 \
        man/runlevel.8 \
        man/telinit.8 \
        man/halt.8 \
@@ -486,7 +487,21 @@ MANPAGES = \
        man/journald.conf.5 \
        man/systemd-journald.service.8 \
        man/journalctl.1 \
-       man/systemd-inhibit.1
+       man/systemd-inhibit.1 \
+       man/systemd-remount-fs.service.8 \
+       man/systemd-update-utmp-runlevel.service.8 \
+       man/systemd-initctl.service.8 \
+       man/systemd-shutdownd.service.8 \
+       man/systemd-suspend.service.8 \
+       man/systemd-halt.service.8 \
+       man/systemd-fsck@.service.8 \
+       man/systemd-ask-password-console.service.8 \
+       man/systemd-analyze.1 \
+       man/systemd-tty-ask-password-agent.1 \
+       man/systemd-getty-generator.8 \
+       man/systemd-system-update-generator.8 \
+       man/systemd-fstab-generator.8 \
+       man/systemd.preset.5
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -494,14 +509,56 @@ MANPAGES_ALIAS = \
        man/init.1 \
        man/systemd-modules-load.8 \
        man/systemd-sysctl.8 \
-       man/systemd-journald.8
+       man/systemd-journald.socket.8 \
+       man/systemd-journald.8 \
+       man/systemd-remount-fs.8 \
+       man/systemd-update-utmp-shutdown.service.8 \
+       man/systemd-update-utmp.8 \
+       man/systemd-initctl.socket.8 \
+       man/systemd-initctl.8 \
+       man/systemd-shutdownd.socket.8 \
+       man/systemd-shutdownd.8 \
+       man/systemd-hibernate.service.8 \
+       man/systemd-sleep.8 \
+       man/systemd-shutdown.8 \
+       man/systemd-poweroff.service.8 \
+       man/systemd-reboot.service.8 \
+       man/systemd-kexec.service.8 \
+       man/systemd-fsck-root.service.8 \
+       man/systemd-ask-password-console.path.8 \
+       man/systemd-ask-password-wall.service.8 \
+       man/systemd-ask-password-wall.path.8 \
+       man/systemd-tmpfiles-setup.service.8 \
+       man/systemd-tmpfiles-clean.service.8 \
+       man/systemd-tmpfiles-clean.timer.8
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
 man/systemd-modules-load.8: man/systemd-modules-load.service.8
 man/systemd-sysctl.8: man/systemd-sysctl.service.8
+man/systemd-journald.socket.8: man/systemd-journald.service.8
 man/systemd-journald.8: man/systemd-journald.service.8
+man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
+man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
+man/systemd-initctl.socket.8: man/systemd-initctl.service.8
+man/systemd-initctl.8: man/systemd-initctl.service.8
+man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8
+man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
+man/systemd-hibernate.service.8: man/systemd-suspend.service.8
+man/systemd-sleep.8: man/systemd-suspend.service.8
+man/systemd-shutdown.8: man/systemd-halt.service.8
+man/systemd-poweroff.service.8: man/systemd-halt.service.8
+man/systemd-reboot.service.8: man/systemd-halt.service.8
+man/systemd-kexec.service.8: man/systemd-halt.service.8
+man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
+man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
+man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
+man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
+man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -894,6 +951,9 @@ EXTRA_DIST += \
        src/core/systemd.pc.in \
        src/core/macros.systemd.in
 
+CLEANFILES += \
+       src/core/macros.systemd
+
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
        test-engine \
@@ -1473,21 +1533,21 @@ CLEANFILES += \
        src/udev/udev.pc
 
 EXTRA_DIST += \
-       units/systemd-udev.service.in \
+       units/systemd-udevd.service.in \
        units/systemd-udev-trigger.service.in \
        units/systemd-udev-settle.service.in
 
 CLEANFILES += \
-       units/systemd-udev.service \
+       units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service
 
 systemd-install-hook:
        mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
-       ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
-       ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
+       ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
+       ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
        mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-       ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service
+       ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
        ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
@@ -2380,7 +2440,13 @@ INSTALL_DATA_HOOKS += \
        vconsole-install-data-hook
 
 MANPAGES += \
-       man/vconsole.conf.5
+       man/vconsole.conf.5 \
+       man/systemd-vconsole-setup.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-vconsole-setup.8
+
+man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8
 
 EXTRA_DIST += \
        units/systemd-vconsole-setup.service.in
@@ -2423,7 +2489,20 @@ EXTRA_DIST += \
 
 MANPAGES += \
        man/sd_readahead.3 \
-       man/sd-readahead.7
+       man/sd-readahead.7 \
+       man/systemd-readahead-replay.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-readahead-collect.service.8 \
+       man/systemd-readahead-done.service.8 \
+       man/systemd-readahead-done.timer.8 \
+       man/systemd-readahead.8
+
+man/systemd-readahead-collect.service.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead-done.service.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead-done.timer.8: man/systemd-readahead-replay.service.8
+man/systemd-readahead.8: man/systemd-readahead-replay.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2432,16 +2511,25 @@ rootlibexec_PROGRAMS += \
        systemd-quotacheck
 
 nodist_systemunit_DATA += \
-       units/quotacheck.service
+       units/systemd-quotacheck.service
 
 EXTRA_DIST += \
-       units/quotacheck.service.in
+       units/systemd-quotacheck.service.in
 
 systemd_quotacheck_SOURCES = \
        src/quotacheck/quotacheck.c
 
 systemd_quotacheck_LDADD = \
        libsystemd-shared.la
+
+MANPAGES += \
+       man/systemd-quotacheck.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-quotacheck.8
+
+man/systemd-quotacheck.8: man/systemd-quotacheck.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2477,6 +2565,17 @@ randomseed-install-data-hook:
 
 INSTALL_DATA_HOOKS += \
        randomseed-install-data-hook
+
+MANPAGES += \
+       man/systemd-random-seed-load.service.8
+
+MANPAGES_ALIAS +=  \
+       man/systemd-random-seed-save.service.8 \
+       man/systemd-random-seed.8
+
+man/systemd-random-seed-save.service.8: man/systemd-random-seed-load.service.8
+man/systemd-random-seed.8: man/systemd-random-seed-load.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2519,6 +2618,17 @@ cryptsetup-install-data-hook:
 
 INSTALL_DATA_HOOKS += \
        cryptsetup-install-data-hook
+
+MANPAGES += \
+       man/systemd-cryptsetup@.service.8 \
+       man/systemd-cryptsetup-generator.8 \
+       man/crypttab.5
+
+MANPAGES_ALIAS += \
+       man/systemd-cryptsetup.8
+
+man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -2566,6 +2676,14 @@ hostnamed-install-data-hook:
 INSTALL_DATA_HOOKS += \
        hostnamed-install-data-hook
 
+MANPAGES += \
+       man/systemd-hostnamed.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-hostnamed.8
+
+man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+
 EXTRA_DIST += \
        units/systemd-hostnamed.service.in
 endif
@@ -2616,10 +2734,18 @@ localed-install-data-hook:
 INSTALL_DATA_HOOKS += \
        localed-install-data-hook
 
+MANPAGES += \
+       man/systemd-localed.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-localed.8
+
+man/systemd-localed.8: man/systemd-localed.service.8
+
 EXTRA_DIST += \
        units/systemd-localed.service.in
 
-dist_pkgdata_DATA = \
+dist_pkgdata_DATA += \
        src/locale/kbd-model-map
 
 dist_noinst_SCRIPT = \
@@ -2675,6 +2801,14 @@ timedated-install-data-hook:
 INSTALL_DATA_HOOKS += \
        timedated-install-data-hook
 
+MANPAGES += \
+       man/systemd-timedated.service.8
+
+MANPAGES_ALIAS += \
+       man/systemd-timedated.8
+
+man/systemd-timedated.8: man/systemd-timedated.service.8
+
 EXTRA_DIST += \
        units/systemd-timedated.service.in
 endif
@@ -2920,7 +3054,8 @@ MANPAGES += \
        man/sd_uid_get_state.3 \
        man/sd_session_is_active.3 \
        man/sd_seat_get_active.3 \
-       man/sd_get_seats.3
+       man/sd_get_seats.3 \
+       man/systemd-user-sessions.service.8
 
 MANPAGES_ALIAS += \
        man/systemd-logind.8 \
@@ -2941,7 +3076,8 @@ MANPAGES_ALIAS += \
        man/sd_seat_get_sessions.3 \
        man/sd_seat_can_multi_session.3 \
        man/sd_get_sessions.3 \
-       man/sd_get_uids.3
+       man/sd_get_uids.3 \
+       man/systemd-user-sessions.8
 
 man/systemd-logind.8: man/systemd-logind.service.8
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
@@ -2962,6 +3098,7 @@ man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
 man/sd_get_sessions.3: man/sd_get_seats.3
 man/sd_get_uids.3: man/sd_get_seats.3
+man/systemd-user-sessions.8: man/systemd-user-sessions.service.8
 
 EXTRA_DIST += \
        src/login/logind-gperf.gperf \
@@ -3171,10 +3308,10 @@ systemd-install-data-hook:
                $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f systemd-remount-fs.service \
-                       fsck-root.service \
+                       systemd-fsck-root.service \
                        tmp.mount && \
                $(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
-               $(LN_S) ../fsck-root.service fsck-root.service && \
+               $(LN_S) ../systemd-fsck-root.service systemd-fsck-root.service && \
                $(LN_S) ../tmp.mount tmp.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
                rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
@@ -3252,9 +3389,6 @@ if TARGET_FEDORA
                rm -f display-manager.service single.service && \
                $(LN_S) prefdm.service display-manager.service && \
                $(LN_S) rescue.service single.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_MANDRIVA
@@ -3263,9 +3397,6 @@ if TARGET_MANDRIVA
                $(LN_S) prefdm.service display-manager.service && \
                $(LN_S) prefdm.service dm.service && \
                $(LN_S) rescue.service single.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_DEBIAN_OR_UBUNTU
@@ -3285,9 +3416,6 @@ if TARGET_MAGEIA
                rm -f display-manager.service && \
                $(LN_S) prefdm.service display-manager.service && \
                $(LN_S) prefdm.service dm.service )
-       ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-               rm -f display-manager.service && \
-               $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)