install: allow %u an and %U specifiers in WantedBy/RequiredBy/Alias

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index be3fa7140948d869cbd9bf591ae35e003fdc11a9..c44ca0b76d53f8151e669ec4f8fa8dbf385ecba5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -637,6 +637,8 @@ MANPAGES_ALIAS = \
        man/SD_JOURNAL_INVALIDATE.3 \
        man/sd_journal_add_disjunction.3 \
        man/sd_journal_flush_matches.3 \
+       man/sd_journal_get_data_threshold.3 \
+       man/sd_journal_set_data_threshold.3 \
        man/sd_journal_seek_tail.3 \
        man/sd_journal_seek_monotonic_usec.3 \
        man/sd_journal_seek_realtime_usec.3 \
@@ -767,31 +769,12 @@ MANPAGES += \
        man/systemd.index.7 \
        man/systemd.directives.7
 
-XML_DIRECTIVE_FILES = \
-       man/systemd.xml \
-       man/systemd.unit.xml \
-       man/systemd.service.xml \
-       man/systemd.socket.xml \
-       man/systemd.mount.xml \
-       man/systemd.automount.xml \
-       man/systemd.swap.xml \
-       man/systemd.target.xml \
-       man/systemd.path.xml \
-       man/systemd.timer.xml \
-       man/systemd.snapshot.xml \
-       man/systemd.exec.xml \
-       man/systemd.kill.xml \
-       man/systemd.device.xml \
-       man/systemd.conf.xml \
-       man/systemd.journal-fields.xml \
-       man/systemd.time.xml \
-       man/bootchart.conf.xml
-
-man/systemd.index.xml: make-man-index.py $(filter-out man/systemd.index.xml,$(XML_FILES))
+NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
+man/systemd.index.xml: make-man-index.py $(NON_INDEX_XML_FILES)
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $^ > $@
 
-man/systemd.directives.xml: make-directive-index.py $(XML_DIRECTIVE_FILES)
+man/systemd.directives.xml: make-directive-index.py $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $^ > $@
 
@@ -918,6 +901,8 @@ noinst_LTLIBRARIES += \
 libsystemd_units_la_SOURCES = \
        src/shared/install.c \
        src/shared/install.h \
+       src/shared/install-printf.c \
+       src/shared/install-printf.h \
        src/shared/path-lookup.c \
        src/shared/path-lookup.h
 
@@ -1420,7 +1405,8 @@ test_strv_SOURCES = \
        src/test/test-strv.c
 
 test_strv_LDADD = \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-id128-internal.la
 
 test_install_SOURCES = \
        src/test/test-install.c
@@ -1432,7 +1418,8 @@ test_install_CFLAGS = \
 test_install_LDADD = \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-id128-internal.la
 
 test_watchdog_SOURCES = \
        src/test/test-watchdog.c
@@ -2429,6 +2416,7 @@ dist_udevkeymap_DATA = \
        keymaps/hewlett-packard-tablet \
        keymaps/hewlett-packard-tx2 \
        keymaps/hewlett-packard_elitebook-8440p \
+       keymaps/hewlett-packard-hdx9494nr \
        keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
        keymaps/inventec-symphony_6.0_7.0 \
        keymaps/lenovo-3000 \
@@ -3084,6 +3072,9 @@ systemd_bootchart_SOURCES = \
        src/bootchart/log.c \
        src/bootchart/svg.c
 
+systemd_bootchart_LDADD = \
+       libsystemd-shared.la
+
 MANPAGES += \
        man/systemd-bootchart.1 \
        man/bootchart.conf.5