chiark / gitweb /
sd-bus: rename sd_bus_get_owner_id() → sd_bus_get_bus_id()
[elogind.git] / Makefile.am
index de40043..7ab1dea 100644 (file)
@@ -24,6 +24,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 AUTOMAKE_OPTIONS = color-tests parallel-tests
 
+GCC_COLORS ?= 'ooh, shiny!'
+export GCC_COLORS
+
 SUBDIRS = . po
 
 # remove targets if the command fails
@@ -36,16 +39,16 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=6
 
 LIBGUDEV_CURRENT=2
 LIBGUDEV_REVISION=0
 LIBGUDEV_AGE=2
 
-LIBSYSTEMD_CURRENT=4
+LIBSYSTEMD_CURRENT=5
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=4
+LIBSYSTEMD_AGE=5
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -247,6 +250,7 @@ SOCKETS_TARGET_WANTS =
 BUSNAMES_TARGET_WANTS =
 TIMERS_TARGET_WANTS =
 USER_SOCKETS_TARGET_WANTS =
+USER_DEFAULT_TARGET_WANTS =
 USER_BUSNAMES_TARGET_WANTS =
 
 SYSTEM_UNIT_ALIASES =
@@ -267,6 +271,7 @@ install-target-wants-hook:
        what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
        what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
        what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+       what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants)
 
 install-busnames-target-wants-hook:
        what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
@@ -375,7 +380,6 @@ rootlibexec_PROGRAMS = \
        systemd \
        systemd-cgroups-agent \
        systemd-initctl \
-       systemd-update-utmp \
        systemd-shutdownd \
        systemd-shutdown \
        systemd-remount-fs \
@@ -388,6 +392,11 @@ rootlibexec_PROGRAMS = \
        systemd-socket-proxyd \
        systemd-update-done
 
+if HAVE_UTMP
+rootlibexec_PROGRAMS += \
+       systemd-update-utmp
+endif
+
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
@@ -514,8 +523,6 @@ nodist_systemunit_DATA = \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
        units/systemd-remount-fs.service \
-       units/systemd-update-utmp.service \
-       units/systemd-update-utmp-runlevel.service \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
@@ -541,6 +548,12 @@ nodist_systemunit_DATA = \
        units/systemd-nspawn@.service \
        units/systemd-update-done.service
 
+if HAVE_UTMP
+nodist_systemunit_DATA += \
+       units/systemd-update-utmp.service \
+       units/systemd-update-utmp-runlevel.service
+endif
+
 dist_userunit_DATA = \
        units/user/basic.target \
        units/user/default.target \
@@ -701,7 +714,8 @@ man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE
 EXTRA_DIST += \
        man/systemd.index.xml \
        man/index.html \
-       man/systemd.directives.xml
+       man/systemd.directives.xml \
+       man/glib-event-glue.c
 
 CLEANFILES += \
        man/systemd.index.xml \
@@ -718,7 +732,6 @@ EXTRA_DIST += \
        $(man_MANS) \
        tools/make-man-index.py \
        tools/make-directive-index.py \
-       tools/make-man-rules.py \
        tools/xml_helper.py
 
 # ------------------------------------------------------------------------------
@@ -726,20 +739,23 @@ noinst_LTLIBRARIES += \
        libsystemd-shared.la
 
 libsystemd_shared_la_SOURCES = \
+       src/shared/capability.c \
+       src/shared/capability.h \
        src/shared/linux/auto_dev-ioctl.h \
-       src/shared/linux/fanotify.h \
        src/shared/ioprio.h \
        src/shared/missing.h \
        src/shared/initreq.h \
        src/shared/securebits.h \
        src/shared/special.h \
        src/shared/list.h \
+       src/shared/unaligned.h \
        src/shared/macro.h \
        src/shared/def.h \
        src/shared/sparse-endian.h \
        src/shared/refcnt.h \
        src/shared/udev-util.h \
        src/shared/bus-errors.h \
+       src/shared/bus-errors.c \
        src/shared/device-nodes.c \
        src/shared/device-nodes.h \
        src/shared/util.c \
@@ -756,11 +772,12 @@ libsystemd_shared_la_SOURCES = \
        src/shared/time-util.h \
        src/shared/locale-util.c \
        src/shared/locale-util.h \
+       src/shared/mempool.c \
+       src/shared/mempool.h \
        src/shared/hashmap.c \
        src/shared/hashmap.h \
        src/shared/siphash24.c \
        src/shared/siphash24.h \
-       src/shared/set.c \
        src/shared/set.h \
        src/shared/fdset.c \
        src/shared/fdset.h \
@@ -802,7 +819,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/cgroup-show.h \
        src/shared/unit-name.c \
        src/shared/unit-name.h \
-       src/shared/utmp-wtmp.c \
        src/shared/utmp-wtmp.h \
        src/shared/watchdog.c \
        src/shared/watchdog.h \
@@ -847,8 +863,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/audit.h \
        src/shared/xml.c \
        src/shared/xml.h \
-       src/shared/condition-util.c \
-       src/shared/condition-util.h \
        src/shared/bus-label.c \
        src/shared/bus-label.h \
        src/shared/gpt.h \
@@ -868,14 +882,17 @@ libsystemd_shared_la_SOURCES = \
        src/shared/copy.h \
        src/shared/base-filesystem.c \
        src/shared/base-filesystem.h \
-       src/shared/memfd.c \
-       src/shared/memfd.h \
+       src/shared/memfd-util.c \
+       src/shared/memfd-util.h \
        src/shared/uid-range.c \
        src/shared/uid-range.h \
-       src/shared/switch-root.h \
-       src/shared/switch-root.c \
        src/shared/nss-util.h
 
+if HAVE_UTMP
+libsystemd_shared_la_SOURCES += \
+       src/shared/utmp-wtmp.c
+endif
+
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
        src/shared/errno-to-name.h \
@@ -886,9 +903,13 @@ nodist_libsystemd_shared_la_SOURCES = \
 
 libsystemd_shared_la_CFLAGS = \
        $(AM_CFLAGS) \
+       $(CAP_CFLAGS) \
        $(SECCOMP_CFLAGS) \
        -pthread
 
+libsystemd_shared_la_LIBADD = \
+       $(CAP_LIBS)
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-units.la
@@ -916,12 +937,16 @@ libsystemd_label_la_SOURCES = \
        src/shared/mkdir-label.c \
        src/shared/ask-password-api.c \
        src/shared/ask-password-api.h \
+       src/shared/switch-root.h \
+       src/shared/switch-root.c \
        src/shared/fileio-label.c \
        src/shared/fileio-label.h \
        src/shared/dev-setup.c \
        src/shared/dev-setup.h \
        src/shared/dropin.c \
        src/shared/dropin.h \
+       src/shared/condition.c \
+       src/shared/condition.h \
        src/shared/generator.h \
        src/shared/generator.c
 
@@ -969,21 +994,6 @@ libsystemd_logs_la_SOURCES = \
        src/shared/logs-show.h
 
 # ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-capability.la
-
-libsystemd_capability_la_SOURCES = \
-       src/shared/capability.c \
-       src/shared/capability.h
-
-libsystemd_capability_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
-
-libsystemd_capability_la_LIBADD = \
-       $(CAP_LIBS)
-
-# ------------------------------------------------------------------------------
 if HAVE_ACL
 noinst_LTLIBRARIES += \
        libsystemd-acl.la
@@ -1111,10 +1121,10 @@ libsystemd_core_la_SOURCES = \
        src/core/machine-id-setup.h \
        src/core/mount-setup.c \
        src/core/mount-setup.h \
+       src/core/kmod-setup.c \
+       src/core/kmod-setup.h \
        src/core/loopback-setup.h \
        src/core/loopback-setup.c \
-       src/core/condition.c \
-       src/core/condition.h \
        src/core/namespace.c \
        src/core/namespace.h \
        src/core/build.h \
@@ -1128,12 +1138,6 @@ libsystemd_core_la_SOURCES = \
        src/core/failure-action.c \
        src/core/failure-action.h
 
-if HAVE_KMOD
-libsystemd_core_la_SOURCES += \
-       src/core/kmod-setup.c \
-       src/core/kmod-setup.h
-endif
-
 nodist_libsystemd_core_la_SOURCES = \
        src/core/load-fragment-gperf.c \
        src/core/load-fragment-gperf-nulstr.c
@@ -1142,14 +1146,12 @@ libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(PAM_CFLAGS) \
        $(AUDIT_CFLAGS) \
-       $(CAP_CFLAGS) \
        $(KMOD_CFLAGS) \
        $(APPARMOR_CFLAGS) \
        $(SECCOMP_CFLAGS) \
        -pthread
 
 libsystemd_core_la_LIBADD = \
-       libsystemd-capability.la \
        libsystemd-units.la \
        libsystemd-label.la \
        libudev-internal.la \
@@ -1157,7 +1159,6 @@ libsystemd_core_la_LIBADD = \
        libsystemd-internal.la \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
-       $(CAP_LIBS) \
        $(KMOD_LIBS) \
        $(APPARMOR_LIBS) \
        $(SECCOMP_LIBS)
@@ -1304,6 +1305,7 @@ tests += \
        test-env-replace \
        test-strbuf \
        test-strv \
+       test-path \
        test-path-util \
        test-strxcpyx \
        test-unit-name \
@@ -1327,7 +1329,9 @@ tests += \
        test-fileio \
        test-time \
        test-hashmap \
+       test-set \
        test-list \
+       test-unaligned \
        test-tables \
        test-device-nodes \
        test-xml \
@@ -1338,8 +1342,12 @@ tests += \
        test-capability \
        test-async \
        test-ratelimit \
-       test-condition-util \
-       test-uid-range
+       test-condition \
+       test-uid-range \
+       test-bus-policy \
+       test-locale-util \
+       test-execute \
+       test-copy
 
 EXTRA_DIST += \
        test/a.service \
@@ -1371,7 +1379,15 @@ EXTRA_DIST += \
        test/sysinit.target \
        test/testsuite.target \
        test/timers.target \
-       test/unstoppable.service
+       test/unstoppable.service \
+       test/bus-policy/hello.conf \
+       test/bus-policy/methods.conf \
+       test/bus-policy/ownerships.conf \
+       test/bus-policy/signals.conf \
+       test/bus-policy/check-own-rules.conf \
+       test/bus-policy/many-rules.conf \
+       test/bus-policy/test.conf
+
 
 EXTRA_DIST += \
        src/test/test-helper.h
@@ -1469,8 +1485,7 @@ test_capability_SOURCES = \
        src/test/test-capability.c
 
 test_capability_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-capability.la
+       libsystemd-shared.la
 
 test_async_SOURCES = \
        src/test/test-async.c
@@ -1478,19 +1493,32 @@ test_async_SOURCES = \
 test_async_LDADD = \
        libsystemd-shared.la
 
-test_condition_util_SOURCES = \
-       src/test/test-condition-util.c
+test_locale_util_SOURCES = \
+       src/test/test-locale-util.c
 
-test_condition_util_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-internal.la
+test_locale_util_LDADD = \
+       libsystemd-shared.la
+
+test_copy_SOURCES = \
+       src/test/test-copy.c
+
+test_copy_LDADD = \
+       libsystemd-shared.la
 
+test_condition_SOURCES = \
+       src/test/test-condition.c
+
+test_condition_LDADD = \
+       libsystemd-label.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 test_fdset_SOURCES = \
        src/test/test-fdset.c
 
 test_fdset_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la \
+       libsystemd-internal.la
 
 test_ratelimit_SOURCES = \
        src/test/test-ratelimit.c
@@ -1502,31 +1530,32 @@ test_util_SOURCES = \
        src/test/test-util.c
 
 test_util_LDADD = \
-       libsystemd-core.la
+       -lm \
+       libsystemd-shared.la
 
 test_uid_range_SOURCES = \
        src/test/test-uid-range.c
 
 test_uid_range_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
 
 test_socket_util_SOURCES = \
        src/test/test-socket-util.c
 
 test_socket_util_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
 
 test_ring_SOURCES = \
        src/test/test-ring.c
 
 test_ring_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
 
 test_barrier_SOURCES = \
        src/test/test-barrier.c
 
 test_barrier_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
 
 test_pty_SOURCES = \
        src/test/test-pty.c
@@ -1546,11 +1575,36 @@ test_namespace_SOURCES = \
 test_namespace_LDADD = \
        libsystemd-core.la
 
+CLEANFILES += \
+       src/test/test-hashmap-ordered.c
+
+BUILT_SOURCES += \
+       src/test/test-hashmap-ordered.c
+
+src/test/test-hashmap-ordered.c: src/test/test-hashmap-plain.c
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \
+                          { if (!match($$0, "^#include"))          \
+                                gsub(/hashmap/, "ordered_hashmap"); \
+                            gsub(/HASHMAP/, "ORDERED_HASHMAP");     \
+                            gsub(/Hashmap/, "OrderedHashmap");      \
+                            print }' <$< >$@
+
+nodist_test_hashmap_SOURCES = \
+       src/test/test-hashmap-ordered.c
+
 test_hashmap_SOURCES = \
-       src/test/test-hashmap.c
+       src/test/test-hashmap.c \
+       src/test/test-hashmap-plain.c
 
 test_hashmap_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
+
+test_set_SOURCES = \
+       src/test/test-set.c
+
+test_set_LDADD = \
+       libsystemd-shared.la
 
 test_xml_SOURCES = \
        src/test/test-xml.c
@@ -1562,7 +1616,13 @@ test_list_SOURCES = \
        src/test/test-list.c
 
 test_list_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
+
+test_unaligned_LDADD = \
+       libsystemd-shared.la
+
+test_unaligned_SOURCES = \
+       src/test/test-unaligned.c
 
 test_tables_SOURCES = \
        src/test/test-tables.c \
@@ -1592,19 +1652,19 @@ test_prioq_SOURCES = \
        src/test/test-prioq.c
 
 test_prioq_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
 
 test_fileio_SOURCES = \
        src/test/test-fileio.c
 
 test_fileio_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
 
 test_time_SOURCES = \
        src/test/test-time.c
 
 test_time_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
 
 test_architecture_SOURCES = \
        src/test/test-architecture.c
@@ -1616,7 +1676,7 @@ test_log_SOURCES = \
        src/test/test-log.c
 
 test_log_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
 
 test_ipcrm_SOURCES = \
        src/test/test-ipcrm.c
@@ -1641,13 +1701,13 @@ test_ellipsize_SOURCES = \
        src/test/test-ellipsize.c
 
 test_ellipsize_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
 
 test_date_SOURCES = \
        src/test/test-date.c
 
 test_date_LDADD = \
-       libsystemd-core.la
+       libsystemd-shared.la
 
 test_sleep_SOURCES = \
        src/test/test-sleep.c
@@ -1692,8 +1752,7 @@ test_cgroup_mask_SOURCES = \
        src/test/test-cgroup-mask.c
 
 test_cgroup_mask_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+       $(AM_CPPFLAGS)
 
 test_cgroup_mask_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1737,6 +1796,24 @@ test_path_util_SOURCES = \
 test_path_util_LDADD = \
        libsystemd-shared.la
 
+test_path_SOURCES = \
+       src/test/test-path.c
+
+test_path_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_path_LDADD = \
+       libsystemd-core.la
+
+test_execute_SOURCES = \
+       src/test/test-execute.c
+
+test_execute_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_execute_LDADD = \
+       libsystemd-core.la
+
 test_strxcpyx_SOURCES = \
        src/test/test-strxcpyx.c
 
@@ -1762,8 +1839,7 @@ test_sched_prio_SOURCES = \
        src/test/test-sched-prio.c
 
 test_sched_prio_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -DTEST_DIR=\"$(abs_top_srcdir)/test\"
+       $(AM_CPPFLAGS)
 
 test_sched_prio_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1779,6 +1855,15 @@ test_conf_files_SOURCES = \
 test_conf_files_LDADD = \
        libsystemd-shared.la
 
+test_bus_policy_SOURCES = \
+       src/bus-proxyd/test-bus-policy.c \
+       src/bus-proxyd/bus-policy.c \
+       src/bus-proxyd/bus-policy.h
+
+test_bus_policy_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
 .PHONY: coverage lcov-run lcov-report coverage-sync
@@ -1803,7 +1888,8 @@ lcov-report:
        $(MKDIR_P) $(coverage_dir)
        lcov $(coverage_opts) --compat-libtool --capture --no-external \
                | sed 's|$(abspath $(builddir))|$(abspath $(srcdir))|' > $(coverage_dir)/.lcov.info
-       genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov.info
+       lcov --remove $(coverage_dir)/.lcov.info --output-file $(coverage_dir)/.lcov-clean.info 'test-*'
+       genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov-clean.info
        @echo "Coverage report generated in $(abs_builddir)/$(coverage_dir)/index.html"
 
 # lcov doesn't work properly with vpath builds, make sure that bad
@@ -1933,7 +2019,6 @@ systemd_tmpfiles_SOURCES = \
 systemd_tmpfiles_LDADD = \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-capability.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -1954,7 +2039,6 @@ nodist_tmpfiles_DATA = \
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
        tmpfiles.d/systemd-nologin.conf \
-       tmpfiles.d/systemd-remote.conf \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf \
        tmpfiles.d/var.conf
@@ -1996,7 +2080,6 @@ systemd_sysusers_SOURCES = \
 systemd_sysusers_LDADD = \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-capability.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -2010,8 +2093,7 @@ SYSINIT_TARGET_WANTS += \
        systemd-sysusers.service
 
 dist_sysusers_DATA = \
-       sysusers.d/systemd.conf \
-       sysusers.d/systemd-remote.conf
+       sysusers.d/systemd.conf
 
 nodist_sysusers_DATA = \
        sysusers.d/basic.conf
@@ -2031,9 +2113,11 @@ endif
 dist_factory_etc_DATA = \
        factory/etc/nsswitch.conf
 
+if HAVE_PAM
 dist_factory_pam_DATA = \
        factory/etc/pam.d/system-auth \
        factory/etc/pam.d/other
+endif
 
 # ------------------------------------------------------------------------------
 if ENABLE_FIRSTBOOT
@@ -2043,7 +2127,6 @@ systemd_firstboot_SOURCES = \
 systemd_firstboot_LDADD = \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-capability.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
        -lcrypt
@@ -2327,8 +2410,7 @@ systemctl_LDADD = \
 
 # ------------------------------------------------------------------------------
 systemd_notify_SOURCES = \
-       src/notify/notify.c \
-       src/readahead/sd-readahead.c
+       src/notify/notify.c
 
 systemd_notify_LDADD = \
        libsystemd-internal.la \
@@ -2387,7 +2469,6 @@ systemd_nspawn_CFLAGS = \
 
 systemd_nspawn_LDADD = \
        libsystemd-label.la \
-       libsystemd-capability.la \
        libsystemd-internal.la \
        libudev-internal.la \
        libsystemd-shared.la \
@@ -2405,7 +2486,6 @@ systemd_run_SOURCES = \
 
 systemd_run_LDADD = \
        libsystemd-label.la \
-       libsystemd-capability.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -2416,7 +2496,6 @@ systemd_bus_proxyd_SOURCES = \
        src/bus-proxyd/bus-policy.h
 
 systemd_bus_proxyd_LDADD = \
-       libsystemd-capability.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
@@ -2438,13 +2517,16 @@ nodist_systemunit_DATA += \
 dist_systemunit_DATA += \
        units/systemd-bus-proxyd.socket
 
-dist_userunit_DATA += \
-       units/user/systemd-bus-proxyd.socket \
+nodist_userunit_DATA += \
        units/user/systemd-bus-proxyd@.service
+
+dist_userunit_DATA += \
+       units/user/systemd-bus-proxyd.socket
 endif
 
 EXTRA_DIST += \
-       units/systemd-bus-proxyd@.service.in
+       units/systemd-bus-proxyd@.service.in \
+       units/user/systemd-bus-proxyd@.service.in
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
@@ -2529,8 +2611,7 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-network/network-util.c
 
 nodist_libsystemd_internal_la_SOURCES = \
-       src/libsystemd/libsystemd.sym \
-       src/libsystemd/sd-bus/bus-error-mapping.c
+       src/libsystemd/libsystemd.sym
 
 libsystemd_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2558,23 +2639,17 @@ libsystemd_dump_la_SOURCES = \
        src/libsystemd/sd-bus/bus-dump.c \
        src/libsystemd/sd-bus/bus-dump.h
 
-libsystemd_dump_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
-
 noinst_LTLIBRARIES += \
        libsystemd-dump.la
 
 EXTRA_DIST += \
        src/libsystemd/libsystemd.sym.m4 \
        src/libsystemd/libsystemd.pc.in \
-       src/libsystemd/sd-bus/bus-error-mapping.gperf \
        src/libsystemd/sd-bus/DIFFERENCES \
        src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
 
 CLEANFILES += \
-       src/libsystemd/libsystemd.sym \
-       src/libsystemd/sd-bus/bus-error-mapping.c
+       src/libsystemd/libsystemd.sym
 
 BUILT_SOURCES += \
        src/libsystemd/libsystemd.sym
@@ -2662,19 +2737,16 @@ test_bus_marshal_SOURCES = \
        src/libsystemd/sd-bus/test-bus-marshal.c
 
 test_bus_marshal_LDADD = \
+       libsystemd-dump.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
-       libsystemd-dump.la \
-       libsystemd-capability.la \
        $(GLIB_LIBS) \
-       $(DBUS_LIBS) \
-       $(CAP_LIBS)
+       $(DBUS_LIBS)
 
 test_bus_marshal_CFLAGS = \
        $(AM_CFLAGS) \
        $(GLIB_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(CAP_CFLAGS)
+       $(DBUS_CFLAGS)
 
 test_bus_signature_SOURCES = \
        src/libsystemd/sd-bus/test-bus-signature.c
@@ -2721,15 +2793,12 @@ test_bus_objects_SOURCES = \
 
 test_bus_objects_CFLAGS = \
        $(AM_CFLAGS) \
-       $(CAP_CFLAGS) \
        -pthread
 
 test_bus_objects_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
        libsystemd-dump.la \
-       libsystemd-capability.la \
-       $(CAP_LIBS)
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 test_bus_error_SOURCES = \
        src/libsystemd/sd-bus/test-bus-error.c
@@ -2742,26 +2811,22 @@ test_bus_gvariant_SOURCES = \
        src/libsystemd/sd-bus/test-bus-gvariant.c
 
 test_bus_gvariant_LDADD = \
+       libsystemd-dump.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
-       libsystemd-dump.la \
-       libsystemd-capability.la \
-       $(GLIB_LIBS) \
-       $(CAP_LIBS)
+       $(GLIB_LIBS)
 
 test_bus_gvariant_CFLAGS = \
        $(AM_CFLAGS) \
        $(GLIB_CFLAGS)
-       $(CAP_CFLAGS)
 
 test_bus_creds_SOURCES = \
        src/libsystemd/sd-bus/test-bus-creds.c
 
 test_bus_creds_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
        libsystemd-dump.la \
-       libsystemd-capability.la
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 test_bus_match_SOURCES = \
        src/libsystemd/sd-bus/test-bus-match.c
@@ -2774,15 +2839,9 @@ test_bus_kernel_SOURCES = \
        src/libsystemd/sd-bus/test-bus-kernel.c
 
 test_bus_kernel_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
        libsystemd-dump.la \
-       libsystemd-capability.la \
-       $(CAP_LIBS)
-
-test_bus_kernel_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 test_bus_kernel_bloom_SOURCES = \
        src/libsystemd/sd-bus/test-bus-kernel-bloom.c
@@ -2802,15 +2861,9 @@ test_bus_zero_copy_SOURCES = \
        src/libsystemd/sd-bus/test-bus-zero-copy.c
 
 test_bus_zero_copy_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
        libsystemd-dump.la \
-       libsystemd-capability.la \
-       $(CAP_LIBS)
-
-test_bus_zero_copy_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 test_bus_introspect_SOURCES = \
        src/libsystemd/sd-bus/test-bus-introspect.c
@@ -2846,18 +2899,14 @@ test_resolve_CFLAGS = \
        -pthread
 
 busctl_SOURCES = \
-       src/libsystemd/sd-bus/busctl.c
+       src/libsystemd/sd-bus/busctl.c \
+       src/libsystemd/sd-bus/busctl-introspect.c \
+       src/libsystemd/sd-bus/busctl-introspect.h
 
 busctl_LDADD = \
-       libsystemd-internal.la \
-       libsystemd-shared.la \
        libsystemd-dump.la \
-       libsystemd-capability.la \
-       $(CAP_LIBS)
-
-busctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CAP_CFLAGS)
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -2875,6 +2924,7 @@ libsystemd_network_la_SOURCES = \
        src/systemd/sd-icmp6-nd.h \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-dhcp6-lease.h \
+       src/systemd/sd-pppoe.h \
        src/libsystemd-network/sd-dhcp-client.c \
        src/libsystemd-network/sd-dhcp-server.c \
        src/libsystemd-network/dhcp-network.c \
@@ -2889,6 +2939,7 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/ipv4ll-network.c \
        src/libsystemd-network/ipv4ll-packet.c \
        src/libsystemd-network/ipv4ll-internal.h \
+       src/libsystemd-network/sd-pppoe.c \
        src/libsystemd-network/network-internal.c \
        src/libsystemd-network/network-internal.h \
        src/libsystemd-network/sd-icmp6-nd.c \
@@ -2948,6 +2999,14 @@ test_ipv4ll_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+test_pppoe_SOURCES = \
+       src/systemd/sd-pppoe.h \
+       src/libsystemd-network/test-pppoe.c
+
+test_pppoe_LDADD = \
+       libsystemd-network.la \
+       libsystemd-shared.la
+
 test_icmp6_rs_SOURCES = \
        src/systemd/sd-dhcp6-client.h \
        src/systemd/sd-icmp6-nd.h \
@@ -2977,20 +3036,34 @@ tests += \
        test-icmp6-rs \
        test-dhcp6-client
 
+manual_tests += \
+       test-pppoe
+
 # ------------------------------------------------------------------------------
 if ENABLE_TERMINAL
 noinst_LTLIBRARIES += \
        libsystemd-terminal.la
 
+rootlibexec_PROGRAMS += \
+       systemd-consoled
+
 noinst_PROGRAMS += \
        systemd-evcat \
+       systemd-modeset \
        systemd-subterm
 
-unifontdatadir=$(datadir)/unifont
-
-dist_unifontdata_DATA = \
+dist_pkgdata_DATA += \
        src/libsystemd-terminal/unifont-glyph-array.bin
 
+nodist_userunit_DATA += \
+       units/user/systemd-consoled.service
+
+USER_DEFAULT_TARGET_WANTS += \
+       systemd-consoled.service
+
+EXTRA_DIST += \
+       units/user/systemd-consoled.service.in
+
 tests += \
        test-term-page \
        test-term-parser \
@@ -3002,6 +3075,10 @@ libsystemd_terminal_la_CFLAGS = \
        $(TERMINAL_CFLAGS)
 
 libsystemd_terminal_la_SOURCES = \
+       src/libsystemd-terminal/grdev.h \
+       src/libsystemd-terminal/grdev-internal.h \
+       src/libsystemd-terminal/grdev.c \
+       src/libsystemd-terminal/grdev-drm.c \
        src/libsystemd-terminal/idev.h \
        src/libsystemd-terminal/idev-internal.h \
        src/libsystemd-terminal/idev.c \
@@ -3010,13 +3087,15 @@ libsystemd_terminal_la_SOURCES = \
        src/libsystemd-terminal/sysview.h \
        src/libsystemd-terminal/sysview-internal.h \
        src/libsystemd-terminal/sysview.c \
+       src/libsystemd-terminal/term.h \
        src/libsystemd-terminal/term-internal.h \
        src/libsystemd-terminal/term-charset.c \
        src/libsystemd-terminal/term-page.c \
        src/libsystemd-terminal/term-parser.c \
        src/libsystemd-terminal/term-screen.c \
        src/libsystemd-terminal/term-wcwidth.c \
-       src/libsystemd-terminal/unifont-internal.h \
+       src/libsystemd-terminal/unifont.h \
+       src/libsystemd-terminal/unifont-def.h \
        src/libsystemd-terminal/unifont.c
 
 libsystemd_terminal_la_LIBADD = \
@@ -3025,6 +3104,25 @@ libsystemd_terminal_la_LIBADD = \
        libsystemd-shared.la \
        $(TERMINAL_LIBS)
 
+systemd_consoled_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(TERMINAL_CFLAGS)
+
+systemd_consoled_SOURCES = \
+       src/console/consoled.h \
+       src/console/consoled.c \
+       src/console/consoled-display.c \
+       src/console/consoled-manager.c \
+       src/console/consoled-session.c \
+       src/console/consoled-terminal.c \
+       src/console/consoled-workspace.c
+
+systemd_consoled_LDADD = \
+       libsystemd-terminal.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la \
+       $(TERMINAL_LIBS)
+
 systemd_evcat_CFLAGS = \
        $(AM_CFLAGS) \
        $(TERMINAL_CFLAGS)
@@ -3038,6 +3136,19 @@ systemd_evcat_LDADD = \
        libsystemd-shared.la \
        $(TERMINAL_LIBS)
 
+systemd_modeset_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(TERMINAL_CFLAGS)
+
+systemd_modeset_SOURCES = \
+       src/libsystemd-terminal/modeset.c
+
+systemd_modeset_LDADD = \
+       libsystemd-terminal.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la \
+       $(TERMINAL_LIBS)
+
 systemd_subterm_SOURCES = \
        src/libsystemd-terminal/subterm.c
 
@@ -3175,6 +3286,7 @@ dist_udevrules_DATA += \
        rules/50-udev-default.rules \
        rules/60-drm.rules \
        rules/60-keyboard.rules \
+       rules/70-mouse.rules \
        rules/60-persistent-storage-tape.rules \
        rules/60-persistent-serial.rules \
        rules/60-persistent-input.rules \
@@ -3201,7 +3313,8 @@ dist_udevhwdb_DATA = \
        hwdb/20-acpi-vendor.hwdb \
        hwdb/20-OUI.hwdb \
        hwdb/20-net-ifname.hwdb \
-       hwdb/60-keyboard.hwdb
+       hwdb/60-keyboard.hwdb \
+       hwdb/70-mouse.hwdb
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = \
@@ -3352,7 +3465,9 @@ udevadm_SOURCES = \
        src/udev/udevadm-settle.c \
        src/udev/udevadm-trigger.c \
        src/udev/udevadm-test.c \
-       src/udev/udevadm-test-builtin.c
+       src/udev/udevadm-test-builtin.c \
+       src/udev/udevadm-util.c \
+       src/udev/udevadm-util.h
 
 udevadm_LDADD = \
        libudev-core.la
@@ -3389,7 +3504,7 @@ test_udev_SOURCES = \
        src/test/test-udev.c
 
 test_udev_LDADD = \
-       libudev-core.la \
+       libudev-core.la  \
        $(BLKID_LIBS) \
        $(KMOD_LIBS) \
        $(SELINUX_LIBS)
@@ -3724,6 +3839,16 @@ systemd_journal_remote_CFLAGS = \
 systemd_journal_remote_LDADD += \
        $(MICROHTTPD_LIBS)
 
+if ENABLE_SYSUSERS
+dist_sysusers_DATA += \
+       sysusers.d/systemd-remote.conf
+endif
+
+if ENABLE_TMPFILES
+dist_tmpfiles_DATA += \
+       tmpfiles.d/systemd-remote.conf
+endif
+
 if HAVE_GNUTLS
 systemd_journal_remote_LDADD += \
        $(GNUTLS_LIBS)
@@ -3771,7 +3896,6 @@ systemd_journal_upload_CFLAGS = \
        $(LIBCURL_CFLAGS)
 
 systemd_journal_upload_LDADD = \
-       libsystemd-core.la \
        libsystemd-internal.la \
        libsystemd-journal-internal.la \
        libsystemd-shared.la \
@@ -3928,6 +4052,8 @@ libsystemd_journal_core_la_SOURCES = \
        src/journal/journald-wall.h \
        src/journal/journald-native.c \
        src/journal/journald-native.h \
+       src/journal/journald-audit.c \
+       src/journal/journald-audit.h \
        src/journal/journald-rate-limit.c \
        src/journal/journald-rate-limit.h \
        src/journal/journal-internal.h
@@ -3938,7 +4064,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \
 libsystemd_journal_core_la_LIBADD = \
        libsystemd-journal-internal.la \
        libudev-internal.la \
-       libsystemd-capability.la \
        libsystemd-label.la \
        libsystemd-internal.la \
        libsystemd-shared.la
@@ -4079,7 +4204,8 @@ bin_PROGRAMS += \
 
 dist_systemunit_DATA += \
        units/systemd-journald.socket \
-       units/systemd-journald-dev-log.socket
+       units/systemd-journald-dev-log.socket \
+       units/systemd-journald-audit.socket
 
 nodist_systemunit_DATA += \
        units/systemd-journald.service \
@@ -4091,13 +4217,15 @@ dist_pkgsysconf_DATA += \
 
 dist_catalog_DATA = \
        catalog/systemd.fr.catalog \
-       catalog/systemd.ru.catalog \
        catalog/systemd.it.catalog \
+       catalog/systemd.pl.catalog \
+       catalog/systemd.ru.catalog \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
        systemd-journald.socket \
-       systemd-journald-dev-log.socket
+       systemd-journald-dev-log.socket \
+       systemd-journald-audit.socket
 
 SYSINIT_TARGET_WANTS += \
        systemd-journald.service \
@@ -4288,6 +4416,9 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
        units/systemd-vconsole-setup.service
 
+dist_udevrules_DATA += \
+       src/vconsole/90-vconsole.rules
+
 SYSINIT_TARGET_WANTS += \
        systemd-vconsole-setup.service
 endif
@@ -4296,57 +4427,6 @@ EXTRA_DIST += \
        units/systemd-vconsole-setup.service.in
 
 # ------------------------------------------------------------------------------
-if ENABLE_READAHEAD
-systemd_readahead_SOURCES = \
-       src/readahead/readahead.c \
-       src/readahead/readahead-collect.c \
-       src/readahead/readahead-replay.c \
-       src/readahead/readahead-analyze.c \
-       src/readahead/readahead-common.c \
-       src/readahead/readahead-common.h
-
-systemd_readahead_LDADD = \
-       libsystemd-internal.la \
-       libudev-internal.la \
-       libsystemd-shared.la
-
-dist_doc_DATA += \
-       src/readahead/sd-readahead.c \
-       src/systemd/sd-readahead.h
-
-rootlibexec_PROGRAMS += \
-       systemd-readahead
-
-dist_systemunit_DATA += \
-       units/systemd-readahead-drop.service \
-       units/systemd-readahead-done.timer
-
-nodist_systemunit_DATA += \
-       units/systemd-readahead-collect.service \
-       units/systemd-readahead-replay.service \
-       units/systemd-readahead-done.service
-
-manual_tests += \
-       test-ssd
-
-test_ssd_SOURCES = \
-       src/readahead/test-ssd.c \
-       src/readahead/readahead-common.c \
-       src/readahead/readahead-common.h
-
-test_ssd_LDADD = \
-       libsystemd-internal.la \
-       libudev-internal.la \
-       libsystemd-shared.la
-
-endif
-
-EXTRA_DIST += \
-       units/systemd-readahead-collect.service.in \
-       units/systemd-readahead-replay.service.in \
-       units/systemd-readahead-done.service.in
-
-# ------------------------------------------------------------------------------
 if ENABLE_BOOTCHART
 systemd_bootchart_SOURCES = \
        src/bootchart/bootchart.c \
@@ -4561,7 +4641,12 @@ systemd_localed_SOURCES = \
 systemd_localed_LDADD = \
        libsystemd-label.la \
        libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       $(XKBCOMMON_LIBS)
+
+systemd_localed_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(XKBCOMMON_CFLAGS)
 
 nodist_systemunit_DATA += \
        units/systemd-localed.service
@@ -4700,7 +4785,6 @@ systemd_timesyncd_LDADD = \
        libsystemd-resolve.la \
        libsystemd-network.la \
        libsystemd-label.la \
-       libsystemd-capability.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
        -lm
@@ -4901,7 +4985,6 @@ CLEANFILES += \
        src/resolve/resolved-gperf.c
 
 systemd_resolved_LDADD = \
-       libsystemd-capability.la \
        libsystemd-network.la \
        libsystemd-label.la \
        libsystemd-internal.la \
@@ -4954,7 +5037,6 @@ test_dns_domain_SOURCES = \
        src/resolve/test-dns-domain.c
 
 test_dns_domain_LDADD = \
-       libsystemd-capability.la \
        libsystemd-network.la \
        libsystemd-label.la \
        libsystemd-internal.la \
@@ -5018,8 +5100,7 @@ systemd_networkd_SOURCES = \
        src/network/networkd.c
 
 systemd_networkd_LDADD = \
-       libsystemd-networkd-core.la \
-       libsystemd-capability.la
+       libsystemd-networkd-core.la
 
 noinst_LTLIBRARIES += \
        libsystemd-networkd-core.la
@@ -5106,9 +5187,6 @@ networkctl_LDADD = \
 test_network_SOURCES = \
        src/network/test-network.c
 
-test_network_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_network_LDADD = \
        libsystemd-networkd-core.la
 
@@ -5181,7 +5259,6 @@ libsystemd_logind_core_la_SOURCES = \
 
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
-       libsystemd-capability.la \
        libsystemd-internal.la \
        libudev-internal.la \
        libsystemd-shared.la
@@ -5290,7 +5367,6 @@ pam_systemd_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym
 
 pam_systemd_la_LIBADD = \
-       libsystemd-capability.la \
        libsystemd-internal.la \
        libsystemd-shared.la \
        $(PAM_LIBS)
@@ -5337,20 +5413,6 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
        org.freedesktop.login1.busname
 
-if ENABLE_MULTI_SEAT_X
-
-systemd_multi_seat_x_SOURCES = \
-       src/login/multi-seat-x.c
-
-systemd_multi_seat_x_LDADD = \
-       libsystemd-label.la \
-       libsystemd-shared.la
-
-rootlibexec_PROGRAMS += \
-       systemd-multi-seat-x
-
-endif
-
 dist_udevrules_DATA += \
        src/login/70-uaccess.rules \
        src/login/70-power-switch.rules
@@ -5870,6 +5932,7 @@ SOCKETS_TARGET_WANTS += \
        systemd-initctl.socket \
        systemd-shutdownd.socket
 
+if HAVE_UTMP
 if HAVE_SYSV_COMPAT
 RUNLEVEL1_TARGET_WANTS += \
        systemd-update-utmp-runlevel.service
@@ -5884,7 +5947,10 @@ RUNLEVEL5_TARGET_WANTS += \
 endif
 
 SYSINIT_TARGET_WANTS += \
-       systemd-update-utmp.service \
+       systemd-update-utmp.service
+endif
+
+SYSINIT_TARGET_WANTS += \
        systemd-update-done.service
 
 LOCAL_FS_TARGET_WANTS += \
@@ -6195,3 +6261,6 @@ print-%:
 
 git-contrib:
        @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u
+
+EXTRA_DIST += \
+        tools/gdb-sd_dump_hashmaps.py