chiark / gitweb /
man: Add reason for disk model info not working
[elogind.git] / Makefile.am
index c44ca0b76d53f8151e669ec4f8fa8dbf385ecba5..10934eba770765ac1d0f8e1e2193b941b455faf9 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
@@ -68,7 +71,6 @@ sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
 varlogdir=$(localstatedir)/log
 systemdstatedir=$(localstatedir)/lib/systemd
 catalogstatedir=$(systemdstatedir)/catalog
-hwdb_bin=/etc/udev/hwdb.bin
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
@@ -107,6 +109,7 @@ noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
 include_HEADERS =
 pkgconfiglib_DATA =
+polkitpolicy_in_in_files =
 polkitpolicy_in_files =
 polkitpolicy_files =
 dist_udevrules_DATA =
@@ -135,7 +138,6 @@ AM_CPPFLAGS = \
        -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
        -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
        -DCATALOG_PATH=\"$(catalogstatedir)\" \
-       -DHWDB_BIN=\"$(hwdb_bin)\" \
        -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
        -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
@@ -169,7 +171,6 @@ AM_CFLAGS = $(OUR_CFLAGS)
 AM_LDFLAGS = $(OUR_LDFLAGS)
 
 # ------------------------------------------------------------------------------
-
 define move-to-rootlibdir
        if test "$(libdir)" != "$(rootlibdir)"; then \
                $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
@@ -247,7 +248,6 @@ INSTALL_EXEC_HOOKS += \
        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      " $@;
@@ -267,7 +267,8 @@ rootbin_PROGRAMS = \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
        systemd-tmpfiles \
-       systemd-machine-id-setup
+       systemd-machine-id-setup \
+       systemd-analyze
 
 bin_PROGRAMS = \
        systemd-cgls \
@@ -292,25 +293,21 @@ rootlibexec_PROGRAMS = \
        systemd-sysctl \
        systemd-sleep
 
-if HAVE_KMOD
-rootlibexec_PROGRAMS += \
-       systemd-modules-load
-endif
-
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
-       systemd-system-update-generator \
-       systemd-efi-boot-generator
+       systemd-system-update-generator
 
-dist_bin_SCRIPTS = \
-       src/analyze/systemd-analyze
+systemd_analyze_SOURCES = \
+       src/analyze/systemd-analyze.c
 
-EXTRA_DIST += \
-       src/analyze/systemd-analyze.in
+systemd_analyze_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
 
-CLEANFILES += \
-       src/analyze/systemd-analyze
+systemd_analyze_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-dbus.la
 
 dist_bashcompletion_DATA = \
        shell-completion/systemd-bash-completion.sh
@@ -410,11 +407,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
@@ -458,8 +450,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 += \
@@ -485,268 +479,11 @@ dist_doc_DATA = \
 @INTLTOOL_POLICY_RULE@
 
 # ------------------------------------------------------------------------------
-MANPAGES = \
-       man/systemd.1 \
-       man/systemctl.1 \
-       man/systemd-cgls.1 \
-       man/systemd-delta.1 \
-       man/systemd-cgtop.1 \
-       man/systemd-nspawn.1 \
-       man/systemd-tmpfiles.8 \
-       man/systemd-notify.1 \
-       man/systemd.unit.5 \
-       man/systemd.service.5 \
-       man/systemd.socket.5 \
-       man/systemd.mount.5 \
-       man/systemd.automount.5 \
-       man/systemd.swap.5 \
-       man/systemd.timer.5 \
-       man/systemd.path.5 \
-       man/systemd.target.5 \
-       man/systemd.device.5 \
-       man/systemd.snapshot.5 \
-       man/systemd.exec.5 \
-       man/systemd.kill.5 \
-       man/systemd.special.7 \
-       man/systemd.journal-fields.7 \
-       man/systemd.time.7 \
-       man/kernel-command-line.7 \
-       man/daemon.7 \
-       man/bootup.7 \
-       man/runlevel.8 \
-       man/telinit.8 \
-       man/halt.8 \
-       man/shutdown.8 \
-       man/pam_systemd.8 \
-       man/systemd.conf.5 \
-       man/tmpfiles.d.5 \
-       man/hostname.5 \
-       man/localtime.5 \
-       man/machine-id.5 \
-       man/locale.conf.5 \
-       man/os-release.5 \
-       man/machine-info.5 \
-       man/sysctl.d.5 \
-       man/systemd-sysctl.service.8 \
-       man/systemd-ask-password.1 \
-       man/systemd-cat.1 \
-       man/systemd-machine-id-setup.1 \
-       man/systemd-detect-virt.1 \
-       man/journald.conf.5 \
-       man/systemd-journald.service.8 \
-       man/journalctl.1 \
-       man/systemd-coredumpctl.1 \
-       man/systemd-inhibit.1 \
-       man/systemd-remount-fs.service.8 \
-       man/systemd-update-utmp-runlevel.service.8 \
-       man/systemd-initctl.service.8 \
-       man/systemd-shutdownd.service.8 \
-       man/systemd-suspend.service.8 \
-       man/systemd-halt.service.8 \
-       man/systemd-fsck@.service.8 \
-       man/systemd-ask-password-console.service.8 \
-       man/systemd-analyze.1 \
-       man/systemd-tty-ask-password-agent.1 \
-       man/systemd-getty-generator.8 \
-       man/systemd-system-update-generator.8 \
-       man/systemd-fstab-generator.8 \
-       man/systemd.preset.5 \
-       man/sd-id128.3 \
-       man/sd_id128_to_string.3 \
-       man/sd_id128_randomize.3 \
-       man/sd_id128_get_machine.3 \
-       man/sd-journal.3 \
-       man/sd_journal_print.3 \
-       man/sd_journal_stream_fd.3 \
-       man/sd_journal_open.3 \
-       man/sd_journal_next.3 \
-       man/sd_journal_get_data.3 \
-       man/sd_journal_get_realtime_usec.3 \
-       man/sd_journal_get_cutoff_realtime_usec.3 \
-       man/sd_journal_get_cursor.3 \
-       man/sd_journal_get_fd.3 \
-       man/sd_journal_get_usage.3 \
-       man/sd_journal_add_match.3 \
-       man/sd_journal_seek_head.3 \
-       man/sd_journal_query_unique.3 \
-       man/sd_journal_get_catalog.3
-
-MANPAGES_ALIAS = \
-       man/reboot.8 \
-       man/poweroff.8 \
-       man/init.1 \
-       man/systemd-sysctl.8 \
-       man/systemd-journald.socket.8 \
-       man/systemd-journald.8 \
-       man/systemd-remount-fs.8 \
-       man/systemd-update-utmp-shutdown.service.8 \
-       man/systemd-update-utmp.8 \
-       man/systemd-initctl.socket.8 \
-       man/systemd-initctl.8 \
-       man/systemd-shutdownd.socket.8 \
-       man/systemd-shutdownd.8 \
-       man/systemd-hibernate.service.8 \
-       man/systemd-hybrid-sleep.service.8 \
-       man/systemd-sleep.8 \
-       man/systemd-shutdown.8 \
-       man/systemd-poweroff.service.8 \
-       man/systemd-reboot.service.8 \
-       man/systemd-kexec.service.8 \
-       man/systemd-fsck.8 \
-       man/systemd-fsck-root.service.8 \
-       man/systemd-ask-password-console.path.8 \
-       man/systemd-ask-password-wall.service.8 \
-       man/systemd-ask-password-wall.path.8 \
-       man/systemd-tmpfiles-setup.service.8 \
-       man/systemd-tmpfiles-clean.service.8 \
-       man/systemd-tmpfiles-clean.timer.8 \
-       man/sd_id128_t.3 \
-       man/SD_ID128_MAKE.3 \
-       man/SD_ID128_CONST_STR.3 \
-       man/SD_ID128_FORMAT_STR.3 \
-       man/SD_ID128_FORMAT_VAL.3 \
-       man/sd_id128_equal.3 \
-       man/sd_id128_from_string.3 \
-       man/sd_id128_get_boot.3 \
-       man/sd_journal_printv.3 \
-       man/sd_journal_send.3 \
-       man/sd_journal_sendv.3 \
-       man/sd_journal_perror.3 \
-       man/SD_JOURNAL_SUPPRESS_LOCATION.3 \
-       man/sd_journal_open_directory.3 \
-       man/sd_journal_close.3 \
-       man/sd_journal.3 \
-       man/SD_JOURNAL_RUNTIME_ONLY.3 \
-       man/SD_JOURNAL_SYSTEM_ONLY.3 \
-       man/SD_JOURNAL_LOCAL_ONLY.3 \
-       man/sd_journal_previous.3 \
-       man/sd_journal_next_skip.3 \
-       man/sd_journal_previous_skip.3 \
-       man/SD_JOURNAL_FOREACH.3 \
-       man/SD_JOURNAL_FOREACH_BACKWARDS.3 \
-       man/sd_journal_enumerate_data.3 \
-       man/sd_journal_restart_data.3 \
-       man/SD_JOURNAL_FOREACH_DATA.3 \
-       man/sd_journal_get_monotonic_usec.3 \
-       man/sd_journal_get_cutoff_monotonic_usec.3 \
-       man/sd_journal_reliable_fd.3 \
-       man/sd_journal_process.3 \
-       man/sd_journal_wait.3 \
-       man/SD_JOURNAL_NOP.3 \
-       man/SD_JOURNAL_APPEND.3 \
-       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 \
-       man/sd_journal_seek_cursor.3 \
-       man/sd_journal_test_cursor.3 \
-       man/sd_journal_enumerate_unique.3 \
-       man/sd_journal_restart_unique.3 \
-       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
+MANPAGES =
+MANPAGES_ALIAS =
 
-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
-man/systemd-sysctl.8: man/systemd-sysctl.service.8
-man/systemd-journald.socket.8: man/systemd-journald.service.8
-man/systemd-journald.8: man/systemd-journald.service.8
-man/systemd-remount-fs.8: man/systemd-remount-fs.service.8
-man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
-man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
-man/systemd-initctl.socket.8: man/systemd-initctl.service.8
-man/systemd-initctl.8: man/systemd-initctl.service.8
-man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8
-man/systemd-shutdownd.8: man/systemd-shutdownd.service.8
-man/systemd-hibernate.service.8: man/systemd-suspend.service.8
-man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8
-man/systemd-sleep.8: man/systemd-suspend.service.8
-man/systemd-shutdown.8: man/systemd-halt.service.8
-man/systemd-poweroff.service.8: man/systemd-halt.service.8
-man/systemd-reboot.service.8: man/systemd-halt.service.8
-man/systemd-kexec.service.8: man/systemd-halt.service.8
-man/systemd-fsck.8: man/systemd-fsck@.service.8
-man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
-man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
-man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
-man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
-man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
-man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
-man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
-man/sd_id128_t.3: man/sd-id128.3
-man/SD_ID128_MAKE.3: man/sd-id128.3
-man/SD_ID128_CONST_STR.3: man/sd-id128.3
-man/SD_ID128_FORMAT_STR.3: man/sd-id128.3
-man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3
-man/sd_id128_equal.3: man/sd-id128.3
-man/sd_id128_from_string.3: man/sd_id128_to_string.3
-man/sd_id128_get_boot.3: man/sd_id128_get_machine.3
-man/sd_journal_printv.3: man/sd_journal_print.3
-man/sd_journal_send.3: man/sd_journal_print.3
-man/sd_journal_sendv.3: man/sd_journal_print.3
-man/sd_journal_perror.3: man/sd_journal_print.3
-man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3
-man/sd_journal_open_directory.3: man/sd_journal_open.3
-man/sd_journal_close.3: man/sd_journal_open.3
-man/sd_journal.3: man/sd_journal_open.3
-man/SD_JOURNAL_RUNTIME_ONLY.3: man/sd_journal_open.3
-man/SD_JOURNAL_SYSTEM_ONLY.3: man/sd_journal_open.3
-man/SD_JOURNAL_LOCAL_ONLY.3: man/sd_journal_open.3
-man/sd_journal_previous.3: man/sd_journal_next.3
-man/sd_journal_next_skip.3: man/sd_journal_next.3
-man/sd_journal_previous_skip.3: man/sd_journal_next.3
-man/SD_JOURNAL_FOREACH.3: man/sd_journal_next.3
-man/SD_JOURNAL_FOREACH_BACKWARDS.3: man/sd_journal_next.3
-man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3
-man/sd_journal_restart_data.3: man/sd_journal_get_data.3
-man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3
-man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3
-man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3
-man/sd_journal_reliable_fd.3: man/sd_journal_get_fd.3
-man/sd_journal_process.3: man/sd_journal_get_fd.3
-man/sd_journal_wait.3: man/sd_journal_get_fd.3
-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_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
-man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3
-man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3
-man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3
-man/sd_journal_enumerate_unique.3: man/sd_journal_query_unique.3
-man/sd_journal_restart_unique.3: man/sd_journal_query_unique.3
-man/SD_JOURNAL_FOREACH_UNIQUE.3: man/sd_journal_query_unique.3
-man/sd_journal_get_catalog_for_message_id.3: man/sd_journal_get_catalog.3
+include Makefile-man.am
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -765,11 +502,23 @@ CLEANFILES += \
        ${XML_FILES:.xml=.html}
 
 if HAVE_PYTHON
-MANPAGES += \
-       man/systemd.index.7 \
-       man/systemd.directives.7
+noinst_DATA += \
+       man/index.html
+
+CLEANFILES += \
+       man/index.html
+
+man/index.html:
+       $(AM_V_GEN)$(LN_S) systemd.index.html $@
 
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
+
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_srcdir)/man/*.xml.in)
+update-man-list: make-man-rules.py $(XML_GLOB)
+       $(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
+       $(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
+       @echo "Makefile-man.am has been regenerated"
+
 man/systemd.index.xml: make-man-index.py $(NON_INDEX_XML_FILES)
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(PYTHON) $^ > $@
@@ -780,6 +529,7 @@ man/systemd.directives.xml: make-directive-index.py $(filter-out man/systemd.dir
 
 EXTRA_DIST += \
        man/systemd.index.xml \
+       man/index.html \
        man/systemd.directives.xml
 
 endif
@@ -826,6 +576,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/fdset.h \
        src/shared/strv.c \
        src/shared/strv.h \
+       src/shared/env-util.c \
+       src/shared/env-util.h \
        src/shared/strbuf.c \
        src/shared/strbuf.h \
        src/shared/strxcpyx.c \
@@ -871,10 +623,10 @@ libsystemd_shared_la_SOURCES = \
        src/shared/time-dst.h \
        src/shared/calendarspec.c \
        src/shared/calendarspec.h \
+       src/shared/fileio.c \
+       src/shared/fileio.h \
        src/shared/output-mode.h
 
-libsystemd_shared_la_LIBADD = libsystemd-daemon.la
-
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-dbus.la
@@ -925,6 +677,8 @@ libsystemd_label_la_SOURCES = \
        src/shared/mkdir.h \
        src/shared/ask-password-api.c \
        src/shared/ask-password-api.h \
+       src/shared/fileio-label.c \
+       src/shared/fileio-label.h \
        src/shared/dev-setup.c \
        src/shared/dev-setup.h
 
@@ -1108,7 +862,9 @@ libsystemd_core_la_SOURCES = \
        src/core/syscall-list.c \
        src/core/syscall-list.h \
        src/core/audit-fd.c \
-       src/core/audit-fd.h
+       src/core/audit-fd.h \
+       src/core/sync.c \
+       src/core/sync.h
 
 if HAVE_KMOD
 libsystemd_core_la_SOURCES += \
@@ -1128,7 +884,8 @@ libsystemd_core_la_CFLAGS = \
        $(LIBWRAP_CFLAGS) \
        $(PAM_CFLAGS) \
        $(AUDIT_CFLAGS) \
-       $(KMOD_CFLAGS)
+       $(KMOD_CFLAGS) \
+       -pthread
 
 libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
@@ -1219,7 +976,7 @@ dbusinterface_DATA += \
        org.freedesktop.systemd1.Swap.xml \
        org.freedesktop.systemd1.Path.xml
 
-polkitpolicy_in_in_files = \
+polkitpolicy_in_in_files += \
        src/core/org.freedesktop.systemd1.policy.in.in
 
 org.freedesktop.systemd1.%.xml: systemd
@@ -1238,7 +995,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 += \
@@ -1250,15 +1008,17 @@ noinst_PROGRAMS += \
        test-cgroup \
        test-install \
        test-watchdog \
-       test-log \
-       test-efivars
+       test-log
 
 noinst_tests += \
        test-job-type \
        test-env-replace \
+       test-strbuf \
        test-strv \
+       test-strxcpyx \
        test-unit-name \
        test-unit-file \
+       test-util \
        test-date \
        test-sleep \
        test-replace-var \
@@ -1316,15 +1076,24 @@ test_hostname_SOURCES = \
 test_hostname_LDADD = \
        libsystemd-core.la
 
+if ENABLE_EFI
+noinst_PROGRAMS += \
+       test-efivars
+
 test_efivars_SOURCES = \
        src/test/test-efivars.c
 
 test_efivars_LDADD = \
        libsystemd-shared.la
+endif
 
 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
 
@@ -1338,6 +1107,15 @@ test_unit_file_CFLAGS = \
 test_unit_file_LDADD = \
        libsystemd-core.la
 
+test_util_SOURCES = \
+       src/test/test-util.c
+
+test_util_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_util_LDADD = \
+       libsystemd-core.la
+
 test_log_SOURCES = \
        src/test/test-log.c
 
@@ -1401,6 +1179,12 @@ test_env_replace_SOURCES = \
 test_env_replace_LDADD = \
        libsystemd-shared.la
 
+test_strbuf_SOURCES = \
+       src/test/test-strbuf.c
+
+test_strbuf_LDADD = \
+       libsystemd-shared.la
+
 test_strv_SOURCES = \
        src/test/test-strv.c
 
@@ -1408,6 +1192,12 @@ test_strv_LDADD = \
        libsystemd-shared.la \
        libsystemd-id128-internal.la
 
+test_strxcpyx_SOURCES = \
+       src/test/test-strxcpyx.c
+
+test_strxcpyx_LDADD = \
+       libsystemd-shared.la
+
 test_install_SOURCES = \
        src/test/test-install.c
 
@@ -1493,8 +1283,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
 
@@ -1505,8 +1295,23 @@ 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
+
 endif
 
+EXTRA_DIST += \
+       units/systemd-modules-load.service.in
+
 # ------------------------------------------------------------------------------
 systemd_tmpfiles_SOURCES = \
        src/tmpfiles/tmpfiles.c
@@ -1615,12 +1420,17 @@ systemd_system_update_generator_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+if ENABLE_EFI
+systemgenerator_PROGRAMS +=  \
+       systemd-efi-boot-generator
+
 systemd_efi_boot_generator_SOURCES = \
        src/efi-boot-generator/efi-boot-generator.c
 
 systemd_efi_boot_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
+endif
 
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
@@ -1740,6 +1550,9 @@ systemd_tty_ask_password_agent_LDADD = \
 libsystemd_daemon_la_SOURCES = \
        src/libsystemd-daemon/sd-daemon.c
 
+libsystemd_daemon_internal_la_SOURCES = \
+        $(libsystemd_daemon_la_SOURCES)
+
 libsystemd_daemon_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=hidden \
@@ -1767,47 +1580,12 @@ UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook
 lib_LTLIBRARIES += \
        libsystemd-daemon.la
 
+noinst_LTLIBRARIES += \
+        libsystemd-daemon-internal.la
+
 pkgconfiglib_DATA += \
        src/libsystemd-daemon/libsystemd-daemon.pc
 
-MANPAGES += \
-       man/sd-daemon.3 \
-       man/sd_notify.3 \
-       man/sd_listen_fds.3 \
-       man/sd_is_fifo.3 \
-       man/sd_booted.3
-
-MANPAGES_ALIAS += \
-       man/sd_is_socket.3 \
-       man/sd_is_socket_unix.3 \
-       man/sd_is_socket_inet.3 \
-       man/sd_is_mq.3 \
-       man/sd_notifyf.3 \
-       man/SD_LISTEN_FDS_START.3 \
-       man/SD_EMERG.3 \
-       man/SD_ALERT.3 \
-       man/SD_CRIT.3 \
-       man/SD_ERR.3 \
-       man/SD_WARNING.3 \
-       man/SD_NOTICE.3 \
-       man/SD_INFO.3 \
-       man/SD_DEBUG.3
-
-man/sd_is_socket.3: man/sd_is_fifo.3
-man/sd_is_socket_unix.3: man/sd_is_fifo.3
-man/sd_is_socket_inet.3: man/sd_is_fifo.3
-man/sd_is_mq.3: man/sd_is_fifo.3
-man/sd_notifyf.3: man/sd_notify.3
-man/SD_LISTEN_FDS_START.3: man/sd_listen_fds.3
-man/SD_EMERG.3: man/sd-daemon.3
-man/SD_ALERT.3: man/sd-daemon.3
-man/SD_CRIT.3: man/sd-daemon.3
-man/SD_ERR.3: man/sd-daemon.3
-man/SD_WARNING.3: man/sd-daemon.3
-man/SD_NOTICE.3: man/sd-daemon.3
-man/SD_INFO.3: man/sd-daemon.3
-man/SD_DEBUG.3: man/sd-daemon.3
-
 EXTRA_DIST += \
        src/libsystemd-daemon/libsystemd-daemon.pc.in \
        src/libsystemd-daemon/libsystemd-daemon.sym
@@ -1846,7 +1624,9 @@ libudev_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
 
 libudev_la_LIBADD = \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-id128-internal.la
 
 pkgconfiglib_DATA += \
        src/libudev/libudev.pc
@@ -1885,25 +1665,9 @@ libudev_private_la_LIBADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
-MANPAGES += \
-       man/udev.7 \
-       man/udevadm.8 \
-       man/systemd-udevd.service.8
-
-MANPAGES_ALIAS += \
-       man/systemd-udevd.8 \
-       man/systemd-udevd-control.socket.8 \
-       man/systemd-udevd-kernel.socket.8
-
-man/systemd-udevd.8: man/systemd-udevd.service.8
-man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
-man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
-
-udev-confdirs:
-       -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/rules.d
-       -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/hwdb.d
-
-INSTALL_DATA_HOOKS += udev-confdirs
+INSTALL_DIRS += \
+       $(sysconfdir)/udev/rules.d \
+       $(sysconfdir)/udev/hwdb.d
 
 dist_udevrules_DATA += \
        rules/99-systemd.rules \
@@ -1921,11 +1685,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 \
@@ -1991,8 +1750,7 @@ libudev_core_la_SOURCES = \
        src/udev/udev-builtin-input_id.c \
        src/udev/udev-builtin-net_id.c \
        src/udev/udev-builtin-path_id.c \
-       src/udev/udev-builtin-usb_id.c \
-       src/libsystemd-daemon/sd-daemon.c
+       src/udev/udev-builtin-usb_id.c
 
 libudev_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2002,6 +1760,7 @@ libudev_core_la_CFLAGS = \
 libudev_core_la_LIBADD = \
        libudev-private.la \
        libsystemd-label.la \
+       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
@@ -2060,7 +1819,7 @@ INSTALL_DATA_HOOKS += \
        hwdb-update-hook
 
 hwdb-remove-hook:
-       -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN)
+       -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin
 
 # ------------------------------------------------------------------------------
 TESTS += \
@@ -2346,7 +2105,6 @@ EXTRA_DIST += \
        src/gudev/seed-example-enum.js \
        src/gudev/seed-example.js
 
-
 # ------------------------------------------------------------------------------
 if ENABLE_KEYMAP
 keymap_SOURCES = \
@@ -2701,6 +2459,7 @@ libsystemd_journal_la_LDFLAGS = \
 libsystemd_journal_la_LIBADD = \
        libsystemd-shared.la \
        libsystemd-label.la \
+       libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la
 
 libsystemd_journal_internal_la_SOURCES = \
@@ -2874,8 +2633,8 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/journal/journald-gperf.c
 
+# ------------------------------------------------------------------------------
 if HAVE_MICROHTTPD
-
 gatewayddocumentrootdir=$(pkgdatadir)/gatewayd
 
 rootlibexec_PROGRAMS += \
@@ -2967,14 +2726,6 @@ SYSINIT_TARGET_WANTS += \
        systemd-binfmt.service \
        proc-sys-fs-binfmt_misc.automount
 
-MANPAGES += \
-       man/binfmt.d.5 \
-       man/systemd-binfmt.service.8
-
-MANPAGES_ALIAS +=  \
-       man/systemd-binfmt.8
-
-man/systemd-binfmt.8: man/systemd-binfmt.service.8
 endif
 
 EXTRA_DIST += \
@@ -2996,15 +2747,6 @@ nodist_systemunit_DATA += \
 
 SYSINIT_TARGET_WANTS += \
        systemd-vconsole-setup.service
-
-MANPAGES += \
-       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
 endif
 
 EXTRA_DIST += \
@@ -3041,22 +2783,6 @@ nodist_systemunit_DATA += \
        units/systemd-readahead-replay.service \
        units/systemd-readahead-done.service
 
-MANPAGES += \
-       man/sd_readahead.3 \
-       man/sd-readahead.3 \
-       man/systemd-readahead-replay.service.8
-
-MANPAGES_ALIAS += \
-       man/systemd-readahead-collect.service.8 \
-       man/systemd-readahead-done.service.8 \
-       man/systemd-readahead-done.timer.8 \
-       man/systemd-readahead.8
-
-man/systemd-readahead-collect.service.8: man/systemd-readahead-replay.service.8
-man/systemd-readahead-done.service.8: man/systemd-readahead-replay.service.8
-man/systemd-readahead-done.timer.8: man/systemd-readahead-replay.service.8
-man/systemd-readahead.8: man/systemd-readahead-replay.service.8
-
 endif
 
 EXTRA_DIST += \
@@ -3075,10 +2801,6 @@ systemd_bootchart_SOURCES = \
 systemd_bootchart_LDADD = \
        libsystemd-shared.la
 
-MANPAGES += \
-       man/systemd-bootchart.1 \
-       man/bootchart.conf.5
-
 rootlibexec_PROGRAMS += \
        systemd-bootchart
 
@@ -3099,15 +2821,6 @@ systemd_quotacheck_SOURCES = \
 
 systemd_quotacheck_LDADD = \
        libsystemd-shared.la
-
-MANPAGES += \
-       man/systemd-quotacheck.service.8
-
-MANPAGES_ALIAS += \
-       man/systemd-quotacheck.8
-
-man/systemd-quotacheck.8: man/systemd-quotacheck.service.8
-
 endif
 
 EXTRA_DIST += \
@@ -3137,16 +2850,6 @@ SHUTDOWN_TARGET_WANTS += \
 SYSINIT_TARGET_WANTS += \
        systemd-random-seed-load.service
 
-MANPAGES += \
-       man/systemd-random-seed-load.service.8
-
-MANPAGES_ALIAS +=  \
-       man/systemd-random-seed-save.service.8 \
-       man/systemd-random-seed.8
-
-man/systemd-random-seed-save.service.8: man/systemd-random-seed-load.service.8
-man/systemd-random-seed.8: man/systemd-random-seed-load.service.8
-
 endif
 
 EXTRA_DIST += \
@@ -3187,16 +2890,6 @@ systemd_cryptsetup_generator_LDADD = \
 SYSINIT_TARGET_WANTS += \
        cryptsetup.target
 
-MANPAGES += \
-       man/systemd-cryptsetup@.service.8 \
-       man/systemd-cryptsetup-generator.8 \
-       man/crypttab.5
-
-MANPAGES_ALIAS += \
-       man/systemd-cryptsetup.8
-
-man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8
-
 endif
 
 # ------------------------------------------------------------------------------
@@ -3209,6 +2902,7 @@ systemd_hostnamed_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_hostnamed_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
        libsystemd-dbus.la
@@ -3239,14 +2933,6 @@ org.freedesktop.hostname1.xml: systemd-hostnamed
 SYSTEM_UNIT_ALIASES += \
        systemd-hostnamed.service dbus-org.freedesktop.hostname1.service
 
-MANPAGES += \
-       man/systemd-hostnamed.service.8
-
-MANPAGES_ALIAS += \
-       man/systemd-hostnamed.8
-
-man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
-
 hostnamectl_SOURCES = \
        src/hostname/hostnamectl.c
 
@@ -3262,9 +2948,6 @@ hostnamectl_LDADD = \
 bin_PROGRAMS += \
        hostnamectl
 
-MANPAGES += \
-       man/hostnamectl.1
-
 endif
 
 polkitpolicy_in_files += \
@@ -3314,14 +2997,6 @@ org.freedesktop.locale1.xml: systemd-localed
 SYSTEM_UNIT_ALIASES += \
        systemd-localed.service dbus-org.freedesktop.locale1.service
 
-MANPAGES += \
-       man/systemd-localed.service.8
-
-MANPAGES_ALIAS += \
-       man/systemd-localed.8
-
-man/systemd-localed.8: man/systemd-localed.service.8
-
 dist_pkgdata_DATA += \
        src/locale/kbd-model-map
 
@@ -3346,9 +3021,6 @@ localectl_LDADD = \
 bin_PROGRAMS += \
        localectl
 
-MANPAGES += \
-       man/localectl.1
-
 endif
 
 polkitpolicy_in_files += \
@@ -3367,6 +3039,7 @@ systemd_timedated_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemd_timedated_LDADD = \
+       libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
        libsystemd-dbus.la
@@ -3401,14 +3074,6 @@ INSTALL_DIRS += \
 SYSTEM_UNIT_ALIASES += \
        systemd-timedated.service dbus-org.freedesktop.timedate1.service
 
-MANPAGES += \
-       man/systemd-timedated.service.8
-
-MANPAGES_ALIAS += \
-       man/systemd-timedated.8
-
-man/systemd-timedated.8: man/systemd-timedated.service.8
-
 timedatectl_SOURCES = \
        src/timedate/timedatectl.c
 
@@ -3422,10 +3087,6 @@ timedatectl_LDADD = \
 
 bin_PROGRAMS += \
        timedatectl
-
-MANPAGES += \
-       man/timedatectl.1
-
 endif
 
 polkitpolicy_in_files += \
@@ -3434,6 +3095,46 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
        units/systemd-timedated.service.in
 
+# ------------------------------------------------------------------------------
+if ENABLE_EFI
+bootctl_SOURCES = \
+       src/boot/boot.h \
+       src/boot/boot-loader.h \
+       src/boot/bootctl.c \
+       src/boot/boot-loader.c \
+       src/boot/boot-efi.c
+
+bootctl_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-id128.la \
+       libsystemd-daemon.la
+
+bin_PROGRAMS += \
+       bootctl
+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
+
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
@@ -3592,27 +3293,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)
@@ -3679,68 +3359,6 @@ nodist_udevrules_DATA += \
        src/login/71-seat.rules \
        src/login/73-seat-late.rules
 
-MANPAGES += \
-       man/systemd-logind.service.8 \
-       man/logind.conf.5 \
-       man/sd-login.3 \
-       man/loginctl.1 \
-       man/sd_login_monitor_new.3 \
-       man/sd_pid_get_session.3 \
-       man/sd_uid_get_state.3 \
-       man/sd_session_is_active.3 \
-       man/sd_seat_get_active.3 \
-       man/sd_get_seats.3 \
-       man/systemd-user-sessions.service.8
-
-MANPAGES_ALIAS += \
-       man/sd_login_monitor_unref.3 \
-       man/sd_login_monitor_flush.3 \
-       man/sd_login_monitor_get_fd.3 \
-       man/sd_login_monitor.3 \
-       man/sd_session_get_uid.3 \
-       man/sd_session_get_seat.3 \
-       man/sd_session_get_service.3 \
-       man/sd_session_get_state.3 \
-       man/sd_session_get_type.3 \
-       man/sd_session_get_class.3 \
-       man/sd_session_get_display.3 \
-       man/sd_session_get_tty.3 \
-       man/sd_pid_get_owner_uid.3 \
-       man/sd_pid_get_unit.3 \
-       man/sd_uid_is_on_seat.3 \
-       man/sd_uid_get_sessions.3 \
-       man/sd_uid_get_seats.3 \
-       man/sd_seat_get_sessions.3 \
-       man/sd_seat_can_multi_session.3 \
-       man/sd_get_sessions.3 \
-       man/sd_get_uids.3 \
-       man/systemd-logind.8 \
-       man/systemd-user-sessions.8
-
-man/systemd-logind.8: man/systemd-logind.service.8
-man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
-man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
-man/sd_login_monitor.3: man/sd_login_monitor_new.3
-man/sd_session_get_uid.3: man/sd_session_is_active.3
-man/sd_session_get_seat.3: man/sd_session_is_active.3
-man/sd_session_get_service.3: man/sd_session_is_active.3
-man/sd_session_get_state.3: man/sd_session_is_active.3
-man/sd_session_get_type.3: man/sd_session_is_active.3
-man/sd_session_get_class.3: man/sd_session_is_active.3
-man/sd_session_get_display.3: man/sd_session_is_active.3
-man/sd_session_get_tty.3: man/sd_session_is_active.3
-man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
-man/sd_pid_get_unit.3: man/sd_pid_get_session.3
-man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
-man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
-man/sd_uid_get_seats.3: man/sd_uid_get_state.3
-man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
-man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
-man/sd_get_sessions.3: man/sd_get_seats.3
-man/sd_get_uids.3: man/sd_get_seats.3
-man/systemd-user-sessions.8: man/systemd-user-sessions.service.8
-
 CLEANFILES += \
        src/login/logind-gperf.c \
        src/login/71-seat.rules \
@@ -3760,9 +3378,7 @@ EXTRA_DIST += \
        units/systemd-user-sessions.service.in
 
 # ------------------------------------------------------------------------------
-
 if HAVE_PYTHON_DEVEL
-
 pkgpyexec_LTLIBRARIES = \
        _journal.la
 
@@ -3787,11 +3403,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' \
@@ -3800,6 +3414,8 @@ SED_PROCESS = \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
+               -e 's,@SYSTEM_CONFIG_UNIT_PATH\@,$(pkgsysconfdir)/system,g' \
+               -e 's,@USER_CONFIG_UNIT_PATH\@,$(pkgsysconfdir)/user,g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
                -e 's,@systemunitdir\@,$(systemunitdir),g' \
                -e 's,@userunitdir\@,$(userunitdir),g' \
@@ -3858,10 +3474,6 @@ src/%.policy.in: src/%.policy.in.in Makefile
        $(SED_PROCESS)
        $(AM_V_GEN)chmod +x $@
 
-src/analyze/systemd-analyze: %: %.in Makefile
-       $(SED_PROCESS)
-       $(AM_V_GEN)chmod +x $@
-
 src/%.c: src/%.gperf
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GPERF)$(GPERF) < $< > $@
@@ -3870,23 +3482,19 @@ src/%: src/%.m4
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
-M4_PROCESS_SYSTEM = \
-       $(AM_V_M4)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
-
-M4_PROCESS_USER = \
-       $(AM_V_M4)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
-
 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 < $< > $@
 
+if ENABLE_POLKIT
 nodist_polkitpolicy_DATA = \
        $(polkitpolicy_files) \
        $(polkitpolicy_in_in_files:.policy.in.in=.policy)
+endif
 
 EXTRA_DIST += \
        $(polkitpolicy_in_files) \
@@ -3900,6 +3508,7 @@ CLEANFILES += \
        $(pkgconfiglib_DATA) \
        $(nodist_polkitpolicy_DATA)
 
+# ------------------------------------------------------------------------------
 if ENABLE_MANPAGES
 XSLTPROC_FLAGS = \
        --nonet \
@@ -3940,6 +3549,7 @@ CLEANFILES += \
        ${XML_FILES:.xml=.html}
 endif
 
+# ------------------------------------------------------------------------------
 DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
 
 CLEANFILES += \
@@ -3961,7 +3571,6 @@ docs/var-log/README: docs/var-log/README.in
 CLEANFILES += \
        docs/sysvinit/README \
        docs/var-log/README
-
 endif
 
 EXTRA_DIST += \
@@ -4018,6 +3627,7 @@ SYSTEM_UNIT_ALIASES += \
        graphical.target runlevel5.target \
        reboot.target runlevel6.target
 endif
+
 SYSTEM_UNIT_ALIASES += \
        graphical.target default.target \
        reboot.target ctrl-alt-del.target \
@@ -4044,6 +3654,7 @@ INSTALL_DIRS += \
        $(systemunitdir)/runlevel4.target.wants \
        $(systemunitdir)/runlevel5.target.wants
 endif
+
 INSTALL_DIRS += \
        $(tmpfilesdir) \
        $(sysconfdir)/tmpfiles.d \
@@ -4064,11 +3675,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)