X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=054481426ea68a0765c9d76fe2b191d64a504c0e;hp=69a842b77c8be120037a09073519f534a9084cf3;hb=29f4f5118bfd958fc6d812af229535f98723dcb6;hpb=c66e7bc7a19c068ca1c414f2f8bd5dc13c20907f diff --git a/Makefile.am b/Makefile.am index 69a842b77..054481426 100644 --- a/Makefile.am +++ b/Makefile.am @@ -328,17 +328,17 @@ 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-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-udev.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ @@ -349,7 +349,7 @@ dist_userunit_DATA = \ 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-udev-trigger.service \ units/systemd-udev-settle.service \ units/systemd-debug-shell.service.in \ - units/hibernate.service.in \ - units/suspend.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,9 @@ 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 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -494,7 +497,10 @@ MANPAGES_ALIAS = \ man/init.1 \ man/systemd-modules-load.8 \ man/systemd-sysctl.8 \ - man/systemd-journald.8 + man/systemd-journald.8 \ + man/systemd-remount-fs.8 \ + man/systemd-update-utmp-shutdown.service.8 \ + man/systemd-update-utmp.8 man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 @@ -502,6 +508,9 @@ 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.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 XML_FILES = \ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} @@ -894,6 +903,9 @@ EXTRA_DIST += \ src/core/systemd.pc.in \ src/core/macros.systemd.in +CLEANFILES += \ + src/core/macros.systemd + # ------------------------------------------------------------------------------ noinst_PROGRAMS += \ test-engine \ @@ -906,7 +918,8 @@ noinst_PROGRAMS += \ test-env-replace \ test-strv \ test-install \ - test-watchdog + test-watchdog \ + test-unit-name TESTS += \ test-job-type \ @@ -955,6 +968,12 @@ test_hostname_SOURCES = \ test_hostname_LDADD = \ libsystemd-core.la +test_unit_name_SOURCES = \ + src/test/test-unit-name.c + +test_unit_name_LDADD = \ + libsystemd-core.la + test_daemon_SOURCES = \ src/test/test-daemon.c @@ -1424,6 +1443,9 @@ libudev_private_la_LIBADD = \ MANPAGES += \ man/udev.7 \ man/udevadm.8 \ + man/systemd-udevd.service.8 + +MANPAGES_ALIAS += \ man/systemd-udevd.8 udev-confdirs: @@ -2370,7 +2392,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 @@ -2422,10 +2450,10 @@ 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 @@ -2467,6 +2495,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 # ------------------------------------------------------------------------------ @@ -2556,6 +2595,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 @@ -2606,6 +2653,14 @@ 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 @@ -2665,6 +2720,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 @@ -2910,7 +2973,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 \ @@ -2931,7 +2995,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 @@ -2952,6 +3017,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 \ @@ -3161,10 +3227,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 && \