chiark / gitweb /
man: remove boot up runlevel support
[elogind.git] / Makefile.am
index c02145badbee2c9fb2dc8a0fc3f755cb0685c46c..88662c01442f697aa2225cc9cbb7c9713f8a0d05 100644 (file)
@@ -28,6 +28,9 @@ SUBDIRS = . po
 # remove targets if the command fails
 .DELETE_ON_ERROR:
 
+# keep intermediate files
+.SECONDARY:
+
 LIBUDEV_CURRENT=3
 LIBUDEV_REVISION=1
 LIBUDEV_AGE=2
@@ -169,7 +172,6 @@ AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
 
 # ------------------------------------------------------------------------------
-
 define move-to-rootlibdir
        if test "$(libdir)" != "$(rootlibdir)"; then \
                $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
@@ -213,9 +215,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 +248,19 @@ 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 \
@@ -277,11 +293,6 @@ rootlibexec_PROGRAMS = \
        systemd-sysctl \
        systemd-sleep
 
-if HAVE_KMOD
-rootlibexec_PROGRAMS += \
-       systemd-modules-load
-endif
-
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
@@ -395,11 +406,6 @@ nodist_systemunit_DATA = \
        units/systemd-udev-settle.service \
        units/debug-shell.service
 
-if HAVE_KMOD
-nodist_systemunit_DATA += \
-       units/systemd-modules-load.service
-endif
-
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
@@ -443,8 +449,10 @@ EXTRA_DIST += \
        introspect.awk \
        man/custom-html.xsl
 
-EXTRA_DIST += \
-       units/systemd-modules-load.service.in
+CLEANFILES += \
+       units/console-shell.service.m4 \
+       units/console-getty.service.m4 \
+       units/rescue.service.m4
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
@@ -622,6 +630,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 \
@@ -632,30 +642,6 @@ MANPAGES_ALIAS = \
        man/SD_JOURNAL_FOREACH_UNIQUE.3 \
        man/sd_journal_get_catalog_for_message_id.3
 
-if HAVE_KMOD
-MANPAGES += \
-       man/modules-load.d.5 \
-       man/systemd-modules-load.service.8
-MANPAGES_ALIAS += \
-       man/systemd-modules-load.8
-man/systemd-modules-load.8: man/systemd-modules-load.service.8
-endif
-
-if HAVE_MICROHTTPD
-MANPAGES += \
-       man/systemd-journal-gatewayd.service.8
-MANPAGES_ALIAS += \
-       man/systemd-journal-gatewayd.socket.8 \
-       man/systemd-journal-gatewayd.8
-man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
-man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
-endif
-
-if HAVE_MYHOSTNAME
-MANPAGES += \
-       man/nss-myhostname.8
-endif
-
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
@@ -720,6 +706,8 @@ man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3
 man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3
 man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3
 man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3
+man/sd_journal_get_data_threshold.3: man/sd_journal_get_data.3
+man/sd_journal_set_data_threshold.3: man/sd_journal_get_data.3
 man/sd_journal_flush_matches.3: man/sd_journal_add_match.3
 man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3
 man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3
@@ -752,31 +740,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 +872,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 +1145,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 $@)
@@ -1238,7 +1209,8 @@ EXTRA_DIST += \
        src/core/macros.systemd.in
 
 CLEANFILES += \
-       src/core/macros.systemd
+       src/core/macros.systemd \
+       src/core/org.freedesktop.systemd1.policy.in
 
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
@@ -1325,6 +1297,10 @@ test_efivars_LDADD = \
 test_unit_name_SOURCES = \
        src/test/test-unit-name.c
 
+test_unit_name_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
 test_unit_name_LDADD = \
        libsystemd-core.la
 
@@ -1405,7 +1381,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 +1394,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
@@ -1491,8 +1469,8 @@ systemd_shutdown_LDADD = \
        libsystemd-shared.la \
        libudev.la
 
-if HAVE_KMOD
 # ------------------------------------------------------------------------------
+if HAVE_KMOD
 systemd_modules_load_SOURCES = \
        src/modules-load/modules-load.c
 
@@ -1503,8 +1481,29 @@ systemd_modules_load_CFLAGS = \
 systemd_modules_load_LDADD = \
        libsystemd-shared.la \
        $(KMOD_LIBS)
+
+rootlibexec_PROGRAMS += \
+       systemd-modules-load
+
+nodist_systemunit_DATA += \
+       units/systemd-modules-load.service
+SYSINIT_TARGET_WANTS += \
+       systemd-modules-load.service
+
+dist_udevrules_DATA += \
+       rules/80-drivers.rules
+
+MANPAGES += \
+       man/modules-load.d.5 \
+       man/systemd-modules-load.service.8
+MANPAGES_ALIAS += \
+       man/systemd-modules-load.8
+man/systemd-modules-load.8: man/systemd-modules-load.service.8
 endif
 
+EXTRA_DIST += \
+       units/systemd-modules-load.service.in
+
 # ------------------------------------------------------------------------------
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles/tmpfiles.c
@@ -1919,11 +1918,6 @@ dist_udevrules_DATA += \
        rules/80-net-name-slot.rules \
        rules/95-udev-late.rules
 
-if HAVE_KMOD
-dist_udevrules_DATA += \
-       rules/80-drivers.rules
-endif
-
 dist_udevhwdb_DATA = \
        hwdb/20-pci-vendor-product.hwdb \
        hwdb/20-pci-classes.hwdb \
@@ -2344,7 +2338,6 @@ EXTRA_DIST += \
        src/gudev/seed-example-enum.js \
        src/gudev/seed-example.js
 
-
 # ------------------------------------------------------------------------------
 if ENABLE_KEYMAP
 keymap_SOURCES = \
@@ -2414,6 +2407,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 +2459,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 "};"}' < $< > $@
@@ -2871,8 +2865,8 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/journal/journald-gperf.c
 
+# ------------------------------------------------------------------------------
 if HAVE_MICROHTTPD
-
 gatewayddocumentrootdir=$(pkgdatadir)/gatewayd
 
 rootlibexec_PROGRAMS += \
@@ -2905,6 +2899,13 @@ nodist_systemunit_DATA += \
 dist_gatewayddocumentroot_DATA = \
        src/journal/browse.html
 
+MANPAGES += \
+       man/systemd-journal-gatewayd.service.8
+MANPAGES_ALIAS += \
+       man/systemd-journal-gatewayd.socket.8 \
+       man/systemd-journal-gatewayd.8
+man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
+man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
 endif
 
 EXTRA_DIST += \
@@ -3069,6 +3070,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
@@ -3190,7 +3194,6 @@ MANPAGES_ALIAS += \
        man/systemd-cryptsetup.8
 
 man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8
-
 endif
 
 # ------------------------------------------------------------------------------
@@ -3428,6 +3431,31 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
        units/systemd-timedated.service.in
 
+# ------------------------------------------------------------------------------
+if HAVE_MYHOSTNAME
+libnss_myhostname_la_SOURCES = \
+       src/nss-myhostname/nss-myhostname.c \
+       src/nss-myhostname/ifconf.h \
+       src/nss-myhostname/netlink.c
+
+libnss_myhostname_la_CFLAGS = \
+       $(AM_CFLAGS)
+
+libnss_myhostname_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -module \
+       -export-dynamic \
+       -avoid-version \
+       -shared \
+       -shrext .so.2
+
+lib_LTLIBRARIES += \
+       libnss_myhostname.la
+
+MANPAGES += \
+       man/nss-myhostname.8
+endif
+
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
@@ -3586,27 +3614,6 @@ pamlib_LTLIBRARIES = \
        pam_systemd.la
 endif
 
-if HAVE_MYHOSTNAME
-libnss_myhostname_la_SOURCES = \
-       src/nss-myhostname/nss-myhostname.c \
-       src/nss-myhostname/ifconf.h \
-       src/nss-myhostname/netlink.c
-
-libnss_myhostname_la_CFLAGS = \
-       $(AM_CFLAGS)
-
-libnss_myhostname_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -module \
-       -export-dynamic \
-       -avoid-version \
-       -shared \
-       -shrext .so.2
-
-lib_LTLIBRARIES += \
-       libnss_myhostname.la
-endif
-
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-login-install-hook:
        libname=libsystemd-login.so && $(move-to-rootlibdir)
@@ -3754,9 +3761,7 @@ EXTRA_DIST += \
        units/systemd-user-sessions.service.in
 
 # ------------------------------------------------------------------------------
-
 if HAVE_PYTHON_DEVEL
-
 pkgpyexec_LTLIBRARIES = \
        _journal.la
 
@@ -3781,11 +3786,9 @@ _journal_la_LIBADD = \
 dist_pkgpyexec_PYTHON = \
        src/python-systemd/journal.py \
        src/python-systemd/__init__.py
-
 endif
 
 # ------------------------------------------------------------------------------
-
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
@@ -3858,25 +3861,19 @@ 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) < $< > $@
-
-M4_PROCESS_SYSTEM = \
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
-
-M4_PROCESS_USER = \
-       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
+       $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
 units/%: units/%.m4 Makefile
-       $(M4_PROCESS_SYSTEM)
+       $(AM_V_M4)$(MKDIR_P) $(dir $@)
+       $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 units/user/%: units/%.m4 Makefile
-       $(M4_PROCESS_USER)
+       $(AM_V_M4)$(MKDIR_P) $(dir $@)
+       $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 nodist_polkitpolicy_DATA = \
        $(polkitpolicy_files) \
@@ -3894,6 +3891,7 @@ CLEANFILES += \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA)
 
+# ------------------------------------------------------------------------------
 if ENABLE_MANPAGES
 XSLTPROC_FLAGS = \
        --nonet \
@@ -3904,11 +3902,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
@@ -3934,6 +3932,7 @@ CLEANFILES += \
        ${XML_FILES:.xml=.html}
 endif
 
+# ------------------------------------------------------------------------------
 DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
 
 CLEANFILES += \
@@ -3955,7 +3954,6 @@ docs/var-log/README: docs/var-log/README.in
 CLEANFILES += \
        docs/sysvinit/README \
        docs/var-log/README
-
 endif
 
 EXTRA_DIST += \
@@ -3969,6 +3967,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 +3978,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 +4000,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 +4008,10 @@ 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 +4029,16 @@ 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 \
@@ -4051,11 +4058,6 @@ INSTALL_DIRS += \
        $(dbussessionservicedir) \
        $(sysconfdir)/xdg/systemd
 
-if HAVE_KMOD
-SYSINIT_TARGET_WANTS += \
-       systemd-modules-load.service
-endif
-
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
 uninstall-hook: $(UNINSTALL_DATA_HOOKS) $(UNINSTALL_EXEC_HOOKS)