chiark / gitweb /
install: allow %u an and %U specifiers in WantedBy/RequiredBy/Alias
[elogind.git] / Makefile.am
index c02145badbee2c9fb2dc8a0fc3f755cb0685c46c..c44ca0b76d53f8151e669ec4f8fa8dbf385ecba5 100644 (file)
@@ -213,9 +213,10 @@ install-target-wants-hook:
        what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
 
 define add-wants
-       dir=$(DESTDIR)$(systemunitdir)/$$wants.wants && \
-       $(MKDIR_P) -m 0755 $$dir && \
-       ( cd $$dir && \
+       [ -z "$$what" ] || ( \
+         dir=$(DESTDIR)$(systemunitdir)/$$wants.wants && \
+         $(MKDIR_P) -m 0755 $$dir && \
+         cd $$dir && \
          rm -f $$what && \
          for i in $$what; do ln -s ../$$i . || exit $$? ; done )
 endef
@@ -245,6 +246,20 @@ INSTALL_EXEC_HOOKS += \
        install-directories-hook \
        install-aliases-hook
 
+# ------------------------------------------------------------------------------
+
+AM_V_M4 = $(AM_V_M4_$(V))
+AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY))
+AM_V_M4_0 = @echo "  M4      " $@;
+
+AM_V_XSLT = $(AM_V_XSLT_$(V))
+AM_V_XSLT_ = $(AM_V_XSLT_$(AM_DEFAULT_VERBOSITY))
+AM_V_XSLT_0 = @echo "  XSLT    " $@;
+
+AM_V_GPERF = $(AM_V_GPERF_$(V))
+AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
+AM_V_GPERF_0 = @echo "  GPERF   " $@;
+
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
        systemctl \
@@ -622,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 \
@@ -752,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) $^ > $@
 
@@ -903,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
 
@@ -1174,7 +1174,7 @@ src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
 
 src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
+       $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
 
 src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile
        $(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -1405,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
@@ -1417,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
@@ -2414,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 \
@@ -2465,7 +2468,7 @@ src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
 
 src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile
-       $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
+       $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
 
 src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
@@ -3069,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
@@ -3858,18 +3864,18 @@ src/analyze/systemd-analyze: %: %.in Makefile
 
 src/%.c: src/%.gperf
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(GPERF) < $< > $@
+       $(AM_V_GPERF)$(GPERF) < $< > $@
 
 src/%: src/%.m4
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(M4) -P $(M4_DEFINES) < $< > $@
+       $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
 M4_PROCESS_SYSTEM = \
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(AM_V_M4)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 M4_PROCESS_USER = \
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(AM_V_M4)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 units/%: units/%.m4 Makefile
@@ -3904,11 +3910,11 @@ XSLTPROC_FLAGS = \
        --stringparam man.copyright.section.enabled 0
 
 XSLTPROC_PROCESS_MAN = \
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
        $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
 XSLTPROC_PROCESS_HTML = \
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
        $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
 
 man/%.1: man/%.xml
@@ -3969,6 +3975,7 @@ SOCKETS_TARGET_WANTS += \
        systemd-initctl.socket \
        systemd-shutdownd.socket
 
+if HAVE_SYSV_COMPAT
 RUNLEVEL1_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 RUNLEVEL2_TARGET_WANTS += \
@@ -3979,6 +3986,7 @@ RUNLEVEL4_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
 RUNLEVEL5_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
+endif
 SHUTDOWN_TARGET_WANTS += \
        systemd-update-utmp-shutdown.service
 LOCAL_FS_TARGET_WANTS += \
@@ -4000,6 +4008,7 @@ SYSINIT_TARGET_WANTS += \
 BASIC_TARGET_WANTS += \
        systemd-tmpfiles-clean.timer
 
+if HAVE_SYSV_COMPAT
 SYSTEM_UNIT_ALIASES += \
        poweroff.target runlevel0.target \
        rescue.target runlevel1.target \
@@ -4007,7 +4016,9 @@ SYSTEM_UNIT_ALIASES += \
        multi-user.target runlevel3.target \
        multi-user.target runlevel4.target \
        graphical.target runlevel5.target \
-       reboot.target runlevel6.target \
+       reboot.target runlevel6.target
+endif
+SYSTEM_UNIT_ALIASES += \
        graphical.target default.target \
        reboot.target ctrl-alt-del.target \
        getty@.service autovt@.service
@@ -4025,13 +4036,15 @@ GENERAL_ALIASES += \
        $(pkgsysconfdir)/user $(sysconfdir)/xdg/systemd/user \
        ../system-services/org.freedesktop.systemd1.service $(dbussessionservicedir)/org.freedesktop.systemd1.service
 
+if HAVE_SYSV_COMPAT
 INSTALL_DIRS += \
        $(systemunitdir)/runlevel1.target.wants \
        $(systemunitdir)/runlevel2.target.wants \
        $(systemunitdir)/runlevel3.target.wants \
        $(systemunitdir)/runlevel4.target.wants \
-       $(systemunitdir)/runlevel5.target.wants \
-       \
+       $(systemunitdir)/runlevel5.target.wants
+endif
+INSTALL_DIRS += \
        $(tmpfilesdir) \
        $(sysconfdir)/tmpfiles.d \
        $(prefix)/lib/modules-load.d \