man: document systemd-vconsole-setup.service

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 98a85063ca1e9cc7a8f8dd1fc56c9ac900f6dfb5..b7fb370c0e90097b589f1e59c4d907fefe3b7823 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ LIBUDEV_REVISION=1
 LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=1
+LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=2
@@ -57,6 +57,7 @@ pkgconfigdatadir=$(datadir)/pkgconfig
 pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=$(sysconfdir)/bash_completion.d
+rpmmacrosdir=$(sysconfdir)/rpm
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -459,7 +460,9 @@ MANPAGES = \
        man/systemd.exec.5 \
        man/systemd.special.7 \
        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 \
@@ -885,8 +888,12 @@ org.freedesktop.systemd1.%.xml: systemd
 pkgconfigdata_DATA = \
        src/core/systemd.pc
 
+nodist_rpmmacros_DATA = \
+       src/core/macros.systemd
+
 EXTRA_DIST += \
-       src/core/systemd.pc.in
+       src/core/systemd.pc.in \
+       src/core/macros.systemd.in
 
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
@@ -900,7 +907,8 @@ noinst_PROGRAMS += \
        test-env-replace \
        test-strv \
        test-install \
-       test-watchdog
+       test-watchdog \
+       test-unit-name
 
 TESTS += \
        test-job-type \
@@ -949,6 +957,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
 
@@ -1418,6 +1432,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:
@@ -2364,7 +2381,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
@@ -2372,39 +2395,24 @@ endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_READAHEAD
-systemd_readahead_collect_SOURCES = \
+systemd_readahead_SOURCES = \
+       src/readahead/readahead.c \
        src/readahead/readahead-collect.c \
-       src/readahead/readahead-common.c \
-       src/readahead/readahead-common.h
-
-systemd_readahead_collect_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
-       libudev.la
-
-systemd_readahead_replay_SOURCES = \
        src/readahead/readahead-replay.c \
+       src/readahead/readahead-analyze.c \
        src/readahead/readahead-common.c \
        src/readahead/readahead-common.h
 
-systemd_readahead_replay_LDADD = \
+systemd_readahead_LDADD = \
        libsystemd-shared.la \
        libsystemd-daemon.la \
        libudev.la
 
-systemd_readahead_analyze_SOURCES = \
-       src/readahead/readahead-analyze.c \
-       src/readahead/readahead-common.h
-
 pkginclude_HEADERS += \
        src/systemd/sd-readahead.h
 
 rootlibexec_PROGRAMS += \
-       systemd-readahead-collect \
-       systemd-readahead-replay
-
-bin_PROGRAMS += \
-       systemd-readahead-analyze
+       systemd-readahead
 
 dist_systemunit_DATA += \
        units/systemd-readahead-drop.service \
@@ -3015,6 +3023,9 @@ sysctl.d/%: sysctl.d/%.in Makefile
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
+src/core/macros.%: src/core/macros.%.in Makefile
+       $(SED_PROCESS)
+
 src/%.policy.in: src/%.policy.in.in Makefile
        $(SED_PROCESS)