man,html: say 'systemd 198' in the header

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 89768e6c32844acb849289c7935e6b6fee119667..cfcca7c88be9ff6b306671ba48c00a0ea7e8442c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -652,8 +652,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/watchdog.h \
        src/shared/spawn-ask-password-agent.c \
        src/shared/spawn-ask-password-agent.h \
-       src/shared/specifier.c \
-       src/shared/specifier.h \
        src/shared/replace-var.c \
        src/shared/replace-var.h \
        src/shared/spawn-polkit-agent.c \
@@ -697,7 +695,9 @@ libsystemd_units_la_SOURCES = \
        src/shared/install-printf.c \
        src/shared/install-printf.h \
        src/shared/path-lookup.c \
-       src/shared/path-lookup.h
+       src/shared/path-lookup.h \
+       src/shared/specifier.c \
+       src/shared/specifier.h
 
 libsystemd_units_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1235,6 +1235,7 @@ test_strv_SOURCES = \
 
 test_strv_LDADD = \
        libsystemd-shared.la \
+       libsystemd-units.la \
        libsystemd-id128-internal.la
 
 test_strxcpyx_SOURCES = \
@@ -1785,7 +1786,7 @@ SYSINIT_TARGET_WANTS += \
        systemd-udevd.service \
        systemd-udev-trigger.service
 
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
        udevadm
 
 rootlibexec_PROGRAMS += \
@@ -1871,7 +1872,7 @@ udevadm_LDADD = \
 # Update hwdb on installation. Do not bother if installing
 # in DESTDIR, since this is likely for packaging purposes.
 hwdb-update-hook:
-       -test -n "$(DESTDIR)" || $(bindir)/udevadm hwdb --update
+       -test -n "$(DESTDIR)" || $(rootbindir)/udevadm hwdb --update
 
 INSTALL_DATA_HOOKS += \
        hwdb-update-hook
@@ -2877,7 +2878,8 @@ if ENABLE_BOOTCHART
 systemd_bootchart_SOURCES = \
        src/bootchart/bootchart.c \
        src/bootchart/bootchart.h \
-       src/bootchart/log.c \
+       src/bootchart/store.c \
+       src/bootchart/store.h \
        src/bootchart/svg.c
 
 systemd_bootchart_LDADD = \
@@ -3678,31 +3680,31 @@ XSLTPROC_FLAGS = \
        --nonet \
        --stringparam man.output.quietly 1 \
        --stringparam funcsynopsis.style ansi \
-       --stringparam man.th.extra1.suppress 1 \
        --stringparam man.authors.section.enabled 0 \
-       --stringparam man.copyright.section.enabled 0
+       --stringparam man.copyright.section.enabled 0 \
+       --stringparam systemd.version $(VERSION)
 
 XSLTPROC_PROCESS_MAN = \
        $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $<
 
 XSLTPROC_PROCESS_HTML = \
        $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
        $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
 
-man/%.1: man/%.xml
+man/%.1: man/%.xml man/custom-man.xsl
        $(XSLTPROC_PROCESS_MAN)
 
-man/%.3: man/%.xml
+man/%.3: man/%.xml man/custom-man.xsl
        $(XSLTPROC_PROCESS_MAN)
 
-man/%.5: man/%.xml
+man/%.5: man/%.xml man/custom-man.xsl
        $(XSLTPROC_PROCESS_MAN)
 
-man/%.7: man/%.xml
+man/%.7: man/%.xml man/custom-man.xsl
        $(XSLTPROC_PROCESS_MAN)
 
-man/%.8: man/%.xml
+man/%.8: man/%.xml man/custom-man.xsl
        $(XSLTPROC_PROCESS_MAN)
 
 man/%.html: man/%.xml man/custom-html.xsl