chiark / gitweb /
cgroups: Fix test service inclusion in Makefile
[elogind.git] / Makefile.am
index 66012441c08f398a78ebd3902b0c6bec47568710..72a81206507bb6cf9e362bf1ee509b44365b2ed6 100644 (file)
@@ -5,6 +5,7 @@
 #  Copyright 2010-2012 Lennart Poettering
 #  Copyright 2010-2012 Kay Sievers
 #  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
 #
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
@@ -58,11 +59,14 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=3
 LIBSYSTEMD_JOURNAL_AGE=11
 
+LIBSYSTEMD_BUS_CURRENT=0
+LIBSYSTEMD_BUS_REVISION=0
+LIBSYSTEMD_BUS_AGE=0
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
-dbusinterfacedir=@dbusinterfacedir@
 pamlibdir=@pamlibdir@
 pamconfdir=@pamconfdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
@@ -83,6 +87,7 @@ userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
+networkdir=$(prefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -126,7 +131,6 @@ nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
 dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
-dbusinterface_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
@@ -159,6 +163,7 @@ AM_CPPFLAGS = \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
        -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
+       -DRANDOM_SEED_DIR=\"$(localstatedir)/lib/systemd/\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/systemd/random-seed\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
@@ -172,7 +177,9 @@ AM_CPPFLAGS = \
        -DQUOTACHECK=\"$(QUOTACHECK)\" \
        -DKEXEC=\"$(KEXEC)\" \
        -I $(top_srcdir)/src \
+       -I $(top_builddir)/src/shared \
        -I $(top_srcdir)/src/shared \
+       -I $(top_srcdir)/src/network \
        -I $(top_srcdir)/src/login \
        -I $(top_srcdir)/src/journal \
        -I $(top_srcdir)/src/systemd \
@@ -180,8 +187,10 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/core \
        -I $(top_srcdir)/src/libudev \
        -I $(top_srcdir)/src/udev \
+       -I $(top_srcdir)/src/udev/net \
        -I $(top_builddir)/src/udev \
        -I $(top_srcdir)/src/libsystemd-bus \
+       -I $(top_srcdir)/src/libsystemd-rtnl \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -319,24 +328,14 @@ rootlibexec_PROGRAMS = \
        systemd-fsck \
        systemd-ac-power \
        systemd-sysctl \
-       systemd-sleep
+       systemd-sleep \
+       systemd-socket-proxyd
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
        systemd-system-update-generator
 
-systemd_analyze_SOURCES = \
-       src/analyze/systemd-analyze.c
-
-systemd_analyze_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-systemd_analyze_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-dbus.la
-
 dist_bashcompletion_DATA = \
        shell-completion/bash/journalctl \
        shell-completion/bash/systemctl \
@@ -352,6 +351,7 @@ dist_zshcompletion_DATA = \
        shell-completion/zsh/_kernel-install \
        shell-completion/zsh/_systemd-nspawn \
        shell-completion/zsh/_systemd-analyze \
+       shell-completion/zsh/_systemd-run \
        shell-completion/zsh/_sd_hosts_or_user_at_host \
        shell-completion/zsh/_systemd-delta \
        shell-completion/zsh/_systemd
@@ -425,6 +425,7 @@ nodist_systemunit_DATA = \
        units/serial-getty@.service \
        units/console-shell.service \
        units/console-getty.service \
+       units/container-getty@.service \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
        units/systemd-remount-fs.service \
@@ -467,6 +468,7 @@ EXTRA_DIST += \
        units/serial-getty@.service.m4 \
        units/console-shell.service.m4.in \
        units/console-getty.service.m4.in \
+       units/container-getty@.service.m4.in \
        units/rescue.service.m4.in \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
@@ -497,12 +499,12 @@ EXTRA_DIST += \
        units/initrd-cleanup.service.in \
        units/initrd-udevadm-cleanup-db.service.in \
        units/initrd-switch-root.service.in \
-       units/systemd-nspawn@.service.in \
-       introspect.awk
+       units/systemd-nspawn@.service.in
 
 CLEANFILES += \
        units/console-shell.service.m4 \
        units/console-getty.service.m4 \
+       units/container-getty@.service.m4 \
        units/rescue.service.m4
 
 if HAVE_SYSV_COMPAT
@@ -629,6 +631,29 @@ EXTRA_DIST += \
        make-directive-index.py \
        xml_helper.py
 
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-rtnl.la
+
+libsystemd_rtnl_la_SOURCES = \
+       src/systemd/sd-rtnl.h \
+       src/libsystemd-rtnl/sd-rtnl.c \
+       src/libsystemd-rtnl/rtnl-internal.h \
+       src/libsystemd-rtnl/rtnl-message.c \
+       src/libsystemd-rtnl/rtnl-util.h \
+       src/libsystemd-rtnl/rtnl-util.c
+
+test_rtnl_SOURCES = \
+       src/libsystemd-rtnl/test-rtnl.c
+
+test_rtnl_LDADD = \
+       libsystemd-rtnl.la \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
+
+tests += test-rtnl
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-shared.la
@@ -638,16 +663,22 @@ libsystemd_shared_la_SOURCES = \
        src/shared/linux/fanotify.h \
        src/shared/linux/seccomp.h \
        src/shared/linux/seccomp-bpf.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/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/device-nodes.c \
        src/shared/device-nodes.h \
-       src/shared/sparse-endian.h \
        src/shared/util.c \
        src/shared/util.h \
-       src/shared/udev-util.h \
        src/shared/virt.c \
        src/shared/virt.h \
        src/shared/efivars.c \
@@ -688,7 +719,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/gunicode.h \
        src/shared/pager.c \
        src/shared/pager.h \
-       src/shared/ioprio.h \
        src/shared/socket-util.c \
        src/shared/socket-util.h \
        src/shared/conf-files.c \
@@ -724,7 +754,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/acpi-fpdt.c \
        src/shared/boot-timestamps.h \
        src/shared/boot-timestamps.c \
-       src/shared/refcnt.h \
        src/shared/mkdir.c \
        src/shared/mkdir.h \
        src/shared/smack-util.c \
@@ -732,26 +761,21 @@ libsystemd_shared_la_SOURCES = \
        src/shared/apparmor-util.c \
        src/shared/apparmor-util.h \
        src/shared/ima-util.c \
-       src/shared/ima-util.h
-
-#-------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-dbus.la
-
-libsystemd_dbus_la_SOURCES = \
-       src/shared/dbus-common.c \
-       src/shared/dbus-common.h \
-       src/shared/dbus-loop.c \
-       src/shared/dbus-loop.h \
-       src/shared/polkit.c \
-       src/shared/polkit.h
-
-libsystemd_dbus_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
-libsystemd_dbus_la_LIBADD = \
-       $(DBUS_LIBS)
+       src/shared/ima-util.h \
+       src/shared/ptyfwd.c \
+       src/shared/ptyfwd.h \
+       src/shared/net-util.c \
+       src/shared/net-util.h \
+       src/shared/errno-list.c \
+       src/shared/errno-list.h \
+       src/shared/syscall-list.c \
+       src/shared/syscall-list.h
+
+nodist_libsystemd_shared_la_SOURCES = \
+       src/shared/errno-from-name.h \
+       src/shared/errno-to-name.h \
+       src/shared/syscall-from-name.h \
+       src/shared/syscall-to-name.h
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -768,8 +792,7 @@ libsystemd_units_la_SOURCES = \
        src/shared/specifier.h
 
 libsystemd_units_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+       $(AM_CFLAGS)
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -804,14 +827,6 @@ libsystemd_logs_la_SOURCES = \
        src/shared/logs-show.c \
        src/shared/logs-show.h
 
-libsystemd_logs_la_CFLAGS = \
-       $(AM_CFLAGS)
-
-libsystemd_logs_la_LIBADD = \
-       libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la \
-       libsystemd-shared.la
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-capability.la
@@ -835,9 +850,6 @@ libsystemd_audit_la_SOURCES = \
        src/shared/audit.c \
        src/shared/audit.h
 
-libsystemd_audit_la_LIBADD = \
-       libsystemd-capability.la
-
 # ------------------------------------------------------------------------------
 if HAVE_ACL
 noinst_LTLIBRARIES += \
@@ -852,8 +864,7 @@ libsystemd_acl_la_CFLAGS = \
        $(ACL_CFLAGS)
 
 libsystemd_acl_la_LIBADD = \
-       $(ACL_LIBS) \
-       libsystemd-shared.la
+       $(ACL_LIBS)
 endif
 
 # ------------------------------------------------------------------------------
@@ -941,6 +952,8 @@ libsystemd_core_la_SOURCES = \
        src/core/dbus-kill.h \
        src/core/dbus-cgroup.c \
        src/core/dbus-cgroup.h \
+       src/core/dbus-client-track.c \
+       src/core/dbus-client-track.h \
        src/core/cgroup.c \
        src/core/cgroup.h \
        src/core/selinux-access.c \
@@ -967,18 +980,12 @@ libsystemd_core_la_SOURCES = \
        src/core/namespace.h \
        src/core/tcpwrap.c \
        src/core/tcpwrap.h \
-       src/core/securebits.h \
-       src/core/initreq.h \
-       src/core/special.h \
-       src/core/bus-errors.h \
        src/core/build.h \
        src/core/sysfs-show.h \
        src/core/switch-root.h \
        src/core/switch-root.c \
        src/core/killall.h \
        src/core/killall.c \
-       src/core/syscall-list.c \
-       src/core/syscall-list.h \
        src/core/audit-fd.c \
        src/core/audit-fd.h \
        src/core/async.c \
@@ -992,13 +999,10 @@ endif
 
 nodist_libsystemd_core_la_SOURCES = \
        src/core/load-fragment-gperf.c \
-       src/core/load-fragment-gperf-nulstr.c \
-       src/core/syscall-from-name.h \
-       src/core/syscall-to-name.h
+       src/core/load-fragment-gperf-nulstr.c
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
        $(LIBWRAP_CFLAGS) \
        $(PAM_CFLAGS) \
        $(AUDIT_CFLAGS) \
@@ -1009,12 +1013,13 @@ libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-dbus.la \
        libsystemd-audit.la \
        libsystemd-id128-internal.la \
-       libsystemd-daemon.la \
-       libudev.la \
+       libsystemd-daemon-internal.la \
+       libudev-internal.la \
+       libsystemd-shared.la \
+       libsystemd-rtnl.la \
+       libsystemd-bus-internal.la \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
        $(AUDIT_LIBS) \
@@ -1032,42 +1037,56 @@ CLEANFILES += \
        src/core/load-fragment-gperf.gperf \
        src/core/load-fragment-gperf.c \
        src/core/load-fragment-gperf-nulstr.c \
-       src/core/syscall-list.txt \
-       src/core/syscall-from-name.gperf
+       src/shared/syscall-list.txt \
+       src/shared/syscall-from-name.gperf \
+       src/shared/errno-list.txt \
+       src/shared/errno-from-name.gperf
 
 BUILT_SOURCES += \
-       src/core/syscall-from-name.h \
-       src/core/syscall-to-name.h
+       src/shared/syscall-from-name.h \
+       src/shared/syscall-to-name.h \
+       src/shared/errno-from-name.h \
+       src/shared/errno-to-name.h
 
-src/core/syscall-list.txt: Makefile
+src/shared/syscall-list.txt: Makefile
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h - < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9(]/ { sub(/__NR_/, "", $$2); if ($$2 !~ /SYSCALL_BASE/) print $$2; }' > $@
 
-src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
+src/shared/syscall-from-name.gperf: src/shared/syscall-list.txt Makefile
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
 
-src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile
+src/shared/syscall-from-name.h: src/shared/syscall-from-name.gperf Makefile
        $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(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
+src/shared/syscall-to-name.h: src/shared/syscall-list.txt Makefile
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
+
+src/shared/errno-list.txt: Makefile
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - < /dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+[0-9]/ { print $$2; }'  > $@
+
+src/shared/errno-from-name.gperf: src/shared/errno-list.txt Makefile
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct errno_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, %s\n", $$1, $$1 }' < $< > $@
+
+src/shared/errno-from-name.h: src/shared/errno-from-name.gperf Makefile
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_errno -H hash_errno_name -p -C < $< > $@
+
+src/shared/errno-to-name.h: src/shared/errno-list.txt Makefile
        $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[SYSCALL_TO_INDEX(__NR_%s)] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
+       $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
 
 # ------------------------------------------------------------------------------
 systemd_SOURCES = \
        src/core/main.c
 
-systemd_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_LDADD = \
        libsystemd-core.la \
-       libsystemd-daemon.la \
-       libsystemd-id128-internal.la \
-       libsystemd-dbus.la
+       $(RT_LIBS)
 
 dist_pkgsysconf_DATA += \
        src/core/system.conf \
@@ -1079,29 +1098,9 @@ dist_dbuspolicy_DATA += \
 dist_dbussystemservice_DATA += \
        src/core/org.freedesktop.systemd1.service
 
-dbusinterface_DATA += \
-       org.freedesktop.systemd1.Manager.xml \
-       org.freedesktop.systemd1.Job.xml \
-       org.freedesktop.systemd1.Unit.xml \
-       org.freedesktop.systemd1.Service.xml \
-       org.freedesktop.systemd1.Socket.xml \
-       org.freedesktop.systemd1.Timer.xml \
-       org.freedesktop.systemd1.Target.xml \
-       org.freedesktop.systemd1.Device.xml \
-       org.freedesktop.systemd1.Mount.xml \
-       org.freedesktop.systemd1.Automount.xml \
-       org.freedesktop.systemd1.Snapshot.xml \
-       org.freedesktop.systemd1.Swap.xml \
-       org.freedesktop.systemd1.Path.xml
-
 polkitpolicy_in_in_files += \
        src/core/org.freedesktop.systemd1.policy.in.in
 
-org.freedesktop.systemd1.%.xml: systemd
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 pkgconfigdata_DATA = \
        src/core/systemd.pc
 
@@ -1140,6 +1139,7 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-namespace \
        test-date \
        test-sleep \
        test-replace-var \
@@ -1147,6 +1147,7 @@ tests += \
        test-calendarspec \
        test-strip-tab-ansi \
        test-cgroup-util \
+       test-cgroup-mask \
        test-prioq \
        test-fileio \
        test-time \
@@ -1160,7 +1161,10 @@ EXTRA_DIST += \
        test/sched_idle_ok.service \
        test/sched_rr_bad.service \
        test/sched_rr_ok.service \
-       test/sched_rr_change.service
+       test/sched_rr_change.service \
+       test/son.service \
+       test/daughter.service \
+       test/parent.slice
 
 EXTRA_DIST += \
        src/test/test-helper.h
@@ -1174,25 +1178,16 @@ test_device_nodes_LDADD = \
 test_engine_SOURCES = \
        src/test/test-engine.c
 
-test_engine_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 test_engine_LDADD = \
        libsystemd-core.la \
-       libsystemd-daemon.la \
-       libsystemd-dbus.la
+       $(RT_LIBS)
 
 test_job_type_SOURCES = \
        src/test/test-job-type.c
 
-test_job_type_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 test_job_type_LDADD = \
        libsystemd-core.la \
-       libsystemd-daemon.la
+       $(RT_LIBS)
 
 test_ns_SOURCES = \
        src/test/test-ns.c
@@ -1200,15 +1195,10 @@ test_ns_SOURCES = \
 test_ns_LDADD = \
        libsystemd-core.la
 
-test_ns_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 test_loopback_SOURCES = \
        src/test/test-loopback.c
 
 test_loopback_LDADD = \
-       libsystemd-shared.la \
        libsystemd-core.la
 
 test_hostname_SOURCES = \
@@ -1231,56 +1221,44 @@ 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
+       libsystemd-core.la \
+       $(RT_LIBS)
 
 test_unit_file_SOURCES = \
        src/test/test-unit-file.c
 
-test_unit_file_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 test_unit_file_LDADD = \
-       libsystemd-core.la
+       libsystemd-core.la \
+       $(RT_LIBS)
 
 test_utf8_SOURCES = \
        src/test/test-utf8.c
 
-test_utf8_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_utf8_LDADD = \
        libsystemd-shared.la
 
 test_util_SOURCES = \
        src/test/test-util.c
 
-test_util_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_util_LDADD = \
        libsystemd-core.la
 
+test_namespace_SOURCES = \
+       src/test/test-namespace.c
+
+test_namespace_LDADD = \
+       libsystemd-core.la
+
 test_hashmap_SOURCES = \
        src/test/test-hashmap.c
 
-test_hashmap_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_hashmap_LDADD = \
        libsystemd-core.la
 
 test_list_SOURCES = \
        src/test/test-list.c
 
-test_list_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_list_LDADD = \
        libsystemd-core.la
 
@@ -1288,38 +1266,27 @@ test_tables_SOURCES = \
        src/test/test-tables.c \
        src/shared/test-tables.h
 
-test_tables_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 test_tables_LDADD = \
+       libsystemd-logs.la \
+       libsystemd-journal-internal.la \
        libsystemd-core.la \
-       libsystemd-logs.la
+       $(RT_LIBS)
 
 test_prioq_SOURCES = \
        src/test/test-prioq.c
 
-test_prioq_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_prioq_LDADD = \
        libsystemd-core.la
 
 test_fileio_SOURCES = \
        src/test/test-fileio.c
 
-test_fileio_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_fileio_LDADD = \
        libsystemd-core.la
 
 test_time_SOURCES = \
        src/test/test-time.c
 
-test_time_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_time_LDADD = \
        libsystemd-core.la
 
@@ -1369,8 +1336,8 @@ test_daemon_SOURCES = \
        src/test/test-daemon.c
 
 test_daemon_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-daemon.la
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 test_cgroup_SOURCES = \
        src/test/test-cgroup.c
@@ -1379,13 +1346,25 @@ test_cgroup_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
+test_cgroup_mask_SOURCES = \
+       src/test/test-cgroup-mask.c
+
+test_cgroup_mask_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+       -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+
+test_cgroup_mask_LDADD = \
+       libsystemd-core.la \
+       $(RT_LIBS)
+
 test_cgroup_util_SOURCES = \
        src/test/test-cgroup-util.c
 
 test_cgroup_util_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 test_env_replace_SOURCES = \
        src/test/test-env-replace.c
@@ -1403,9 +1382,9 @@ test_strv_SOURCES = \
        src/test/test-strv.c
 
 test_strv_LDADD = \
-       libsystemd-shared.la \
        libsystemd-units.la \
-       libsystemd-id128-internal.la
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 test_path_util_SOURCES = \
        src/test/test-path-util.c
@@ -1422,15 +1401,11 @@ test_strxcpyx_LDADD = \
 test_install_SOURCES = \
        src/test/test-install.c
 
-test_install_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 test_install_LDADD = \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-id128-internal.la
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 test_watchdog_SOURCES = \
        src/test/test-watchdog.c
@@ -1443,12 +1418,11 @@ test_sched_prio_SOURCES = \
 
 test_sched_prio_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
        -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
 
 test_sched_prio_LDADD = \
        libsystemd-core.la \
-       libsystemd-daemon.la
+       $(RT_LIBS)
 
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
@@ -1488,18 +1462,25 @@ lcov-run lcov-report:
        echo "Need to reconfigure with --enable-coverage"
 endif
 
+# ------------------------------------------------------------------------------
+systemd_analyze_SOURCES = \
+       src/analyze/analyze.c
+
+systemd_analyze_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
        src/initctl/initctl.c
 
-systemd_initctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_initctl_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
@@ -1507,12 +1488,13 @@ systemd_update_utmp_SOURCES = \
 
 systemd_update_utmp_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
        $(AUDIT_CFLAGS)
 
 systemd_update_utmp_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
        $(AUDIT_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1521,10 +1503,10 @@ systemd_shutdownd_SOURCES = \
 
 systemd_shutdownd_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
-pkginclude_HEADERS += \
+dist_doc_DATA += \
        src/systemd/sd-shutdown.h
 
 # ------------------------------------------------------------------------------
@@ -1539,8 +1521,8 @@ systemd_shutdown_SOURCES = \
 
 systemd_shutdown_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libudev.la
+       libudev-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 if HAVE_KMOD
@@ -1586,9 +1568,9 @@ systemd_tmpfiles_SOURCES = \
 
 systemd_tmpfiles_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
        libsystemd-capability.la \
-       libsystemd-id128-internal.la
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 rootbin_PROGRAMS += \
        systemd-tmpfiles
@@ -1639,8 +1621,8 @@ systemd_machine_id_setup_SOURCES = \
 
 systemd_machine_id_setup_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-id128-internal.la
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_sysctl_SOURCES = \
@@ -1660,22 +1642,20 @@ systemd_sleep_LDADD = \
 systemd_fsck_SOURCES = \
        src/fsck/fsck.c
 
-systemd_fsck_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_fsck_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-dbus.la \
-       libudev.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libudev-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_ac_power_SOURCES = \
        src/ac-power/ac-power.c
 
 systemd_ac_power_LDADD = \
-       libsystemd-shared.la \
-       libudev.la
+       libudev-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_detect_virt_SOURCES = \
@@ -1744,11 +1724,15 @@ bootctl_SOURCES = \
 
 bootctl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-id128.la \
-       libsystemd-daemon.la
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la
 
 bin_PROGRAMS += \
        bootctl
+
+dist_zshcompletion_DATA += \
+       shell-completion/zsh/_bootctl
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -1761,9 +1745,9 @@ systemd_gpt_auto_generator_SOURCES = \
 
 systemd_gpt_auto_generator_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
        libsystemd-id128-internal.la \
-       libudev-private.la \
+       libudev-internal.la \
+       libsystemd-shared.la \
        $(BLKID_LIBS)
 
 systemd_gpt_auto_generator_CFLAGS = \
@@ -1793,29 +1777,26 @@ systemd_remount_fs_LDADD = \
 systemd_cgroups_agent_SOURCES = \
        src/cgroups-agent/cgroups-agent.c
 
-systemd_cgroups_agent_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_cgroups_agent_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-dbus.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemctl_SOURCES = \
        src/systemctl/systemctl.c
 
-systemctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemctl_LDADD = \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
-       libsystemd-dbus.la \
-       libsystemd-logs.la
+       libsystemd-bus-internal.la \
+       libsystemd-logs.la \
+       libsystemd-login-internal.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_notify_SOURCES = \
@@ -1823,8 +1804,8 @@ systemd_notify_SOURCES = \
        src/readahead/sd-readahead.c
 
 systemd_notify_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-daemon.la
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_ask_password_SOURCES = \
@@ -1866,10 +1847,11 @@ systemd_nspawn_SOURCES = \
 systemd_nspawn_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
+       libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
-       libsystemd-bus.la
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la \
+       libsystemd-rtnl.la
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -1878,19 +1860,20 @@ systemd_run_SOURCES = \
 systemd_run_LDADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
+       libsystemd-bus-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
-       libsystemd-bus.la
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
        src/stdio-bridge/stdio-bridge.c
 
 systemd_stdio_bridge_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-bus.la \
-       libsystemd-daemon.la
+       libsystemd-bus-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
@@ -1902,11 +1885,16 @@ systemd_tty_ask_password_agent_LDADD = \
 
 # ------------------------------------------------------------------------------
 libsystemd_daemon_la_SOURCES = \
+       src/libsystemd-daemon/libsystemd-daemon.sym \
        src/libsystemd-daemon/sd-daemon.c
 
 libsystemd_daemon_internal_la_SOURCES = \
        $(libsystemd_daemon_la_SOURCES)
 
+libsystemd_daemon_internal_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -DSD_DAEMON_DISABLE_MQ
+
 libsystemd_daemon_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=hidden \
@@ -1943,15 +1931,16 @@ pkgconfiglib_DATA += \
        src/libsystemd-daemon/libsystemd-daemon.pc
 
 EXTRA_DIST += \
-       src/libsystemd-daemon/libsystemd-daemon.pc.in \
-       src/libsystemd-daemon/libsystemd-daemon.sym
+       src/libsystemd-daemon/libsystemd-daemon.pc.in
 
 # ------------------------------------------------------------------------------
 libsystemd_bus_la_SOURCES = \
+       src/libsystemd-bus/libsystemd-bus.sym \
        src/systemd/sd-bus.h \
        src/systemd/sd-bus-protocol.h \
        src/systemd/sd-bus-vtable.h \
        src/systemd/sd-memfd.h \
+       src/systemd/sd-utf8.h \
        src/systemd/sd-event.h \
        src/libsystemd-bus/sd-bus.c \
        src/libsystemd-bus/bus-control.c \
@@ -1964,6 +1953,8 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-socket.h \
        src/libsystemd-bus/bus-kernel.c \
        src/libsystemd-bus/bus-kernel.h \
+       src/libsystemd-bus/bus-container.c \
+       src/libsystemd-bus/bus-container.h \
        src/libsystemd-bus/bus-message.c \
        src/libsystemd-bus/bus-message.h \
        src/libsystemd-bus/bus-signature.c \
@@ -1981,20 +1972,55 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-convenience.c \
        src/libsystemd-bus/kdbus.h \
        src/libsystemd-bus/sd-memfd.c \
-       src/libsystemd-bus/sd-event.c
+       src/libsystemd-bus/bus-util.c \
+       src/libsystemd-bus/bus-util.h \
+       src/libsystemd-bus/sd-utf8.c \
+       src/libsystemd-bus/sd-event.c \
+       src/libsystemd-bus/event-util.h
 
-libsystemd_bus_la_LIBADD =  \
+libsystemd_bus_la_LIBADD = \
        libsystemd-id128-internal.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 libsystemd_bus_la_CFLAGS = \
        $(AM_CFLAGS) \
        -pthread
 
-noinst_LTLIBRARIES += \
+libsystemd_bus_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -version-info $(LIBSYSTEMD_BUS_CURRENT):$(LIBSYSTEMD_BUS_REVISION):$(LIBSYSTEMD_BUS_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-bus.sym
+
+pkgconfiglib_DATA += \
+       src/libsystemd-bus/libsystemd-bus.pc
+
+EXTRA_DIST += \
+       src/libsystemd-bus/libsystemd-bus.pc.in
+
+lib_LTLIBRARIES += \
        libsystemd-bus.la
 
+libsystemd_bus_internal_la_SOURCES = \
+       $(libsystemd_bus_la_SOURCES)
+
+libsystemd_bus_internal_la_CFLAGS = \
+       $(libsystemd_bus_la_CFLAGS)
+
+noinst_LTLIBRARIES += \
+       libsystemd-bus-internal.la
+
+libsystemd_bus_dump_la_SOURCES = \
+       src/libsystemd-bus/bus-dump.c \
+       src/libsystemd-bus/bus-dump.h
+
+libsystemd_bus_dump_la_CFLAGS = \
+       $(AM_CFLAGS)
+       $(CAP_CFLAGS)
+
+noinst_LTLIBRARIES += \
+       libsystemd-bus-dump.la
+
 tests += \
        test-bus-marshal \
        test-bus-signature \
@@ -2008,31 +2034,38 @@ tests += \
        test-bus-zero-copy \
        test-bus-introspect \
        test-bus-objects \
+       test-bus-error \
        test-event
 
-noinst_PROGRAMS += \
+bin_PROGRAMS += \
        busctl
 
 test_bus_marshal_SOURCES = \
        src/libsystemd-bus/test-bus-marshal.c
 
 test_bus_marshal_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus.la \
+       libsystemd-bus-dump.la \
+       libsystemd-capability.la \
        $(GLIB_LIBS) \
-       $(DBUS_LIBS)
+       $(DBUS_LIBS) \
+       $(CAP_LIBS)
 
 test_bus_marshal_CFLAGS = \
        $(AM_CFLAGS) \
        $(GLIB_CFLAGS) \
-       $(DBUS_CFLAGS)
+       $(DBUS_CFLAGS) \
+       $(CAP_CFLAGS)
 
 test_bus_signature_SOURCES = \
        src/libsystemd-bus/test-bus-signature.c
 
 test_bus_signature_LDADD = \
        libsystemd-shared.la \
-       libsystemd-bus.la
+       libsystemd-bus-internal.la
 
 test_bus_chat_SOURCES = \
        src/libsystemd-bus/test-bus-chat.c
@@ -2042,9 +2075,10 @@ test_bus_chat_CFLAGS = \
        -pthread
 
 test_bus_chat_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-bus.la \
-       libsystemd-id128-internal.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 test_bus_server_SOURCES = \
        src/libsystemd-bus/test-bus-server.c
@@ -2054,110 +2088,134 @@ test_bus_server_CFLAGS = \
        -pthread
 
 test_bus_server_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-bus.la \
-       libsystemd-id128-internal.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 test_bus_objects_SOURCES = \
        src/libsystemd-bus/test-bus-objects.c
 
 test_bus_objects_CFLAGS = \
        $(AM_CFLAGS) \
+       $(CAP_CFLAGS) \
        -pthread
 
 test_bus_objects_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus.la \
-       libsystemd-id128-internal.la
+       libsystemd-bus-dump.la \
+       libsystemd-capability.la \
+       $(CAP_LIBS)
+
+test_bus_error_SOURCES = \
+       src/libsystemd-bus/test-bus-error.c
+
+test_bus_error_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 test_bus_match_SOURCES = \
        src/libsystemd-bus/test-bus-match.c
 
-test_bus_match_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_match_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-bus.la \
-       libsystemd-id128-internal.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 test_bus_kernel_SOURCES = \
        src/libsystemd-bus/test-bus-kernel.c
 
-test_bus_kernel_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_kernel_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus.la \
-       libsystemd-id128-internal.la
+       libsystemd-bus-dump.la \
+       libsystemd-capability.la \
+       $(CAP_LIBS)
+
+test_bus_kernel_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(CAP_CFLAGS)
 
 test_bus_kernel_bloom_SOURCES = \
        src/libsystemd-bus/test-bus-kernel-bloom.c
 
-test_bus_kernel_bloom_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_kernel_bloom_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-bus.la \
-       libsystemd-id128-internal.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 test_bus_kernel_benchmark_SOURCES = \
        src/libsystemd-bus/test-bus-kernel-benchmark.c
 
-test_bus_kernel_benchmark_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_kernel_benchmark_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-bus.la \
-       libsystemd-id128-internal.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 test_bus_memfd_SOURCES = \
        src/libsystemd-bus/test-bus-memfd.c
 
-test_bus_memfd_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_memfd_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-bus.la
+       libsystemd-bus-internal.la \
+       libsystemd-shared.la
 
 test_bus_zero_copy_SOURCES = \
        src/libsystemd-bus/test-bus-zero-copy.c
 
-test_bus_zero_copy_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_zero_copy_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus.la
+       libsystemd-bus-dump.la \
+       libsystemd-capability.la \
+       $(CAP_LIBS)
+
+test_bus_zero_copy_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(CAP_CFLAGS)
 
 test_bus_introspect_SOURCES = \
        src/libsystemd-bus/test-bus-introspect.c
 
-test_bus_introspect_CFLAGS = \
-       $(AM_CFLAGS)
-
 test_bus_introspect_LDADD = \
        libsystemd-shared.la \
-       libsystemd-bus.la
+       libsystemd-bus-internal.la
 
 test_event_SOURCES = \
        src/libsystemd-bus/test-event.c
 
 test_event_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-bus.la \
-       libsystemd-id128-internal.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 busctl_SOURCES = \
        src/libsystemd-bus/busctl.c
 
 busctl_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-shared.la \
-       libsystemd-bus.la
+       libsystemd-bus-dump.la \
+       libsystemd-capability.la \
+       $(CAP_LIBS)
+
+busctl_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(CAP_CFLAGS)
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
@@ -2176,6 +2234,7 @@ lib_LTLIBRARIES += \
        libudev.la
 
 libudev_la_SOURCES =\
+       src/libudev/libudev.sym \
        src/libudev/libudev-private.h \
        src/libudev/libudev.c \
        src/libudev/libudev-list.c \
@@ -2197,18 +2256,15 @@ libudev_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
 
 libudev_la_LIBADD = \
-       libsystemd-shared.la \
-       libsystemd-label.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS) \
-       libsystemd-id128-internal.la
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 pkgconfiglib_DATA += \
        src/libudev/libudev.pc
 
 EXTRA_DIST += \
-       src/libudev/libudev.pc.in \
-       src/libudev/libudev.sym
+       src/libudev/libudev.pc.in
 
 CLEANFILES += \
        src/libudev/libudev.pc \
@@ -2235,29 +2291,30 @@ UNINSTALL_EXEC_HOOKS += libudev-uninstall-hook
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-       libudev-private.la
+       libudev-internal.la
 
-libudev_private_la_SOURCES =\
+libudev_internal_la_SOURCES =\
        $(libudev_la_SOURCES) \
        src/libudev/libudev-device-private.c \
        src/libudev/libudev-queue-private.c
 
-libudev_private_la_CFLAGS = \
+libudev_internal_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=default
 
-libudev_private_la_LIBADD = \
-       libsystemd-shared.la
-
 # ------------------------------------------------------------------------------
 INSTALL_DIRS += \
        $(sysconfdir)/udev/rules.d \
        $(sysconfdir)/udev/hwdb.d
 
+dist_network_DATA = \
+       network/99-default.link
+
 dist_udevrules_DATA += \
        rules/99-systemd.rules \
        rules/42-usb-hid-pm.rules \
        rules/50-udev-default.rules \
+       rules/60-drm.rules \
        rules/60-keyboard.rules \
        rules/60-persistent-storage-tape.rules \
        rules/60-persistent-serial.rules \
@@ -2268,7 +2325,7 @@ dist_udevrules_DATA += \
        rules/75-net-description.rules \
        rules/75-tty-description.rules \
        rules/78-sound-card.rules \
-       rules/80-net-name-slot.rules \
+       rules/80-net-setup-link.rules \
        rules/95-udev-late.rules
 
 dist_udevhwdb_DATA = \
@@ -2349,19 +2406,29 @@ libudev_core_la_SOURCES = \
        src/udev/udev-builtin-input_id.c \
        src/udev/udev-builtin-keyboard.c \
        src/udev/udev-builtin-net_id.c \
+       src/udev/udev-builtin-net_setup_link.c \
        src/udev/udev-builtin-path_id.c \
-       src/udev/udev-builtin-usb_id.c
+       src/udev/udev-builtin-usb_id.c \
+       src/udev/net/link-config.h \
+       src/udev/net/link-config.c \
+       src/udev/net/ethtool-util.h \
+       src/udev/net/ethtool-util.c
 
 nodist_libudev_core_la_SOURCES = \
        src/udev/keyboard-keys-from-name.h \
-       src/udev/keyboard-keys-to-name.h
+       src/udev/keyboard-keys-to-name.h \
+       src/udev/net/link-config-gperf.c
 
 BUILT_SOURCES += \
        $(nodist_libudev_core_la_SOURCES)
 
 CLEANFILES += \
        src/udev/keyboard-keys-from-name.gperf \
-       src/udev/keyboard-keys.txt
+       src/udev/keyboard-keys.txt \
+       src/udev/net/link-config-gperf.c
+
+EXTRA_DIST += \
+       src/udev/net/link-config-gperf.gperf
 
 libudev_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2369,10 +2436,11 @@ libudev_core_la_CFLAGS = \
        $(KMOD_CFLAGS)
 
 libudev_core_la_LIBADD = \
-       libudev-private.la \
+       libudev-internal.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS) \
+       libsystemd-rtnl.la \
+       libsystemd-id128-internal.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
@@ -2433,8 +2501,7 @@ udevadm_SOURCES = \
        src/udev/udevadm-test-builtin.c
 
 udevadm_LDADD = \
-       libudev-core.la \
-       libsystemd-shared.la
+       libudev-core.la
 
 # Update hwdb on installation. Do not bother if installing
 # in DESTDIR, since this is likely for packaging purposes.
@@ -2461,15 +2528,14 @@ test_libudev_SOURCES = \
 
 test_libudev_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libudev.la
+       libudev-internal.la \
+       libsystemd-shared.la
 
 test_udev_SOURCES = \
        src/test/test-udev.c
 
 test_udev_LDADD = \
        libudev-core.la \
-       libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS) \
        $(SELINUX_LIBS)
@@ -2502,7 +2568,7 @@ ata_id_SOURCES = \
        src/udev/ata_id/ata_id.c
 
 ata_id_LDADD = \
-       libudev-private.la \
+       libudev-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -2513,7 +2579,7 @@ cdrom_id_SOURCES = \
        src/udev/cdrom_id/cdrom_id.c
 
 cdrom_id_LDADD = \
-       libudev.la \
+       libudev-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -2527,7 +2593,8 @@ collect_SOURCES = \
        src/udev/collect/collect.c
 
 collect_LDADD = \
-       libudev-private.la
+       libudev-internal.la \
+       libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
        collect
@@ -2540,7 +2607,7 @@ scsi_id_SOURCES =\
        src/udev/scsi_id/scsi_id.h
 
 scsi_id_LDADD = \
-       libudev-private.la \
+       libudev-internal.la \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -2554,7 +2621,7 @@ v4l_id_SOURCES = \
        src/udev/v4l_id/v4l_id.c
 
 v4l_id_LDADD = \
-       libudev.la
+       libudev-internal.la
 
 udevlibexec_PROGRAMS += \
        v4l_id
@@ -2567,7 +2634,7 @@ accelerometer_SOURCES = \
        src/udev/accelerometer/accelerometer.c
 
 accelerometer_LDADD = \
-       libudev.la -lm \
+       libudev-internal.la -lm \
        libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -2671,13 +2738,14 @@ src/gudev/GUdev-1.0.gir: libgudev-1.0.la
 src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
 
 src_gudev_GUdev_1_0_gir_CFLAGS = \
+       $(AM_CFLAGS) \
        $(INCLUDES) \
        -D_GUDEV_COMPILATION \
        -D_GUDEV_WORK_AROUND_DEV_T_BUG \
        -I$(top_srcdir)/src \
        -I$(top_builddir)/src \
-       -I$(top_srcdir)/src/gdev \
-       -I$(top_builddir)/src/gdev
+       -I$(top_srcdir)/src/gudev \
+       -I$(top_builddir)/src/gudev
 
 src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
 
@@ -2737,9 +2805,6 @@ mtd_probe_SOURCES =  \
        src/udev/mtd_probe/mtd_probe.h \
        src/udev/mtd_probe/probe_smartmedia.c
 
-mtd_probe_CPPFLAGS = \
-       $(AM_CPPFLAGS)
-
 dist_udevrules_DATA += \
        rules/75-probe_mtd.rules
 
@@ -2748,6 +2813,7 @@ udevlibexec_PROGRAMS += \
 
 # ------------------------------------------------------------------------------
 libsystemd_id128_la_SOURCES = \
+       src/libsystemd-id128/libsystemd-id128.sym \
        src/libsystemd-id128/sd-id128.c
 
 libsystemd_id128_la_CFLAGS = \
@@ -2760,10 +2826,8 @@ libsystemd_id128_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
-       libsystemd-shared.la \
-       libsystemd-label.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS)
+       libsystemd-shared.la
 
 libsystemd_id128_internal_la_SOURCES = \
        $(libsystemd_id128_la_SOURCES)
@@ -2772,9 +2836,9 @@ test_id128_SOURCES = \
        src/test/test-id128.c
 
 test_id128_LDADD = \
-       libsystemd-shared.la \
        libsystemd-id128-internal.la \
-       libsystemd-daemon.la
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 tests += \
        test-id128
@@ -2802,8 +2866,7 @@ INSTALL_EXEC_HOOKS += libsystemd-id128-install-hook
 UNINSTALL_EXEC_HOOKS += libsystemd-id128-uninstall-hook
 
 EXTRA_DIST += \
-       src/libsystemd-id128/libsystemd-id128.pc.in \
-       src/libsystemd-id128/libsystemd-id128.sym
+       src/libsystemd-id128/libsystemd-id128.pc.in
 
 # ------------------------------------------------------------------------------
 
@@ -2814,8 +2877,9 @@ systemd_activate_SOURCES = \
        src/activate/activate.c
 
 systemd_activate_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-daemon.la
+       libsystemd-label.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 systemd_journald_SOURCES = \
@@ -2823,28 +2887,26 @@ systemd_journald_SOURCES = \
        src/journal/journald-server.h
 
 systemd_journald_LDADD = \
-       libsystemd-journal-internal.la \
-       libsystemd-shared.la \
-       libsystemd-id128-internal.la
+       libsystemd-journal-core.la
 
 systemd_cat_SOURCES = \
        src/journal/cat.c
 
 systemd_cat_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal-internal.la
-
-journalctl_SOURCES = \
-       src/journal/journalctl.c
+       libsystemd-journal-core.la
 
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
        $(AM_CFLAGS)
 
+journalctl_SOURCES = \
+       src/journal/journalctl.c
+
 journalctl_LDADD = \
-       libsystemd-shared.la \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la \
-       libsystemd-logs.la
+       libsystemd-logs.la \
+       libsystemd-shared.la
 
 if HAVE_ACL
 journalctl_LDADD += \
@@ -2867,81 +2929,61 @@ test_journal_SOURCES = \
        src/journal/test-journal.c
 
 test_journal_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la
+       libsystemd-journal-core.la
 
 test_journal_send_SOURCES = \
        src/journal/test-journal-send.c
 
 test_journal_send_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la
+       libsystemd-journal-core.la
 
 test_journal_syslog_SOURCES = \
        src/journal/test-journal-syslog.c
 
 test_journal_syslog_LDADD = \
-       libsystemd-journal-internal.la \
-       libsystemd-shared.la \
-       libsystemd-id128-internal.la
+       libsystemd-journal-core.la
 
 test_journal_match_SOURCES = \
        src/journal/test-journal-match.c
 
 test_journal_match_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la
+       libsystemd-journal-core.la
 
 test_journal_enum_SOURCES = \
        src/journal/test-journal-enum.c
 
 test_journal_enum_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la
+       libsystemd-journal-core.la
 
 test_journal_stream_SOURCES = \
        src/journal/test-journal-stream.c
 
 test_journal_stream_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la
+       libsystemd-journal-core.la
 
 test_journal_init_SOURCES = \
        src/journal/test-journal-init.c
 
 test_journal_init_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-daemon-internal.la \
-       $(RT_LIBS) \
-       libsystemd-journal.la
+       libsystemd-journal-core.la
 
 test_journal_verify_SOURCES = \
        src/journal/test-journal-verify.c
 
 test_journal_verify_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la
+       libsystemd-journal-core.la
 
 test_journal_interleaving_SOURCES = \
        src/journal/test-journal-interleaving.c
 
 test_journal_interleaving_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la
+       libsystemd-journal-core.la
 
 test_mmap_cache_SOURCES = \
        src/journal/test-mmap-cache.c
 
 test_mmap_cache_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal-internal.la
+       libsystemd-journal-core.la
 
 test_catalog_SOURCES = \
        src/journal/test-catalog.c
@@ -2951,14 +2993,13 @@ test_catalog_CFLAGS = \
        -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
 
 test_catalog_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-label.la \
-       libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la
+       libsystemd-journal-core.la
 
 libsystemd_journal_la_SOURCES = \
+       src/journal/libsystemd-journal.sym \
        src/journal/sd-journal.c \
        src/systemd/sd-journal.h \
+       src/systemd/_sd-common.h \
        src/journal/journal-file.c \
        src/journal/journal-file.h \
        src/journal/journal-vacuum.c \
@@ -2985,14 +3026,38 @@ libsystemd_journal_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
 
 libsystemd_journal_la_LIBADD = \
-       libsystemd-shared.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS) \
-       libsystemd-id128-internal.la
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 libsystemd_journal_internal_la_SOURCES = \
-       $(libsystemd_journal_la_SOURCES) \
+       $(libsystemd_journal_la_SOURCES)
+
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
+libsystemd_journal_internal_la_CFLAGS = \
+       $(AM_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD =
+
+if HAVE_XZ
+libsystemd_journal_la_SOURCES += \
+       src/journal/compress.c
+
+libsystemd_journal_la_CFLAGS += \
+       $(XZ_CFLAGS)
+
+libsystemd_journal_la_LIBADD += \
+       $(XZ_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS += \
+       $(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD += \
+       $(XZ_LIBS)
+endif
+
+libsystemd_journal_core_la_SOURCES = \
        src/journal/journald-kmsg.c \
        src/journal/journald-kmsg.h \
        src/journal/journald-syslog.c \
@@ -3009,47 +3074,31 @@ libsystemd_journal_internal_la_SOURCES = \
        src/journal/journald-rate-limit.h \
        src/journal/journal-internal.h
 
-libsystemd_journal_internal_la_CFLAGS = \
-       $(AM_CFLAGS)
+nodist_libsystemd_journal_core_la_SOURCES = \
+       src/journal/journald-gperf.c
 
-libsystemd_journal_internal_la_LIBADD = \
-       libsystemd-label.la \
+libsystemd_journal_core_la_LIBADD = \
+       libsystemd-journal-internal.la \
+       libudev-internal.la \
        libsystemd-audit.la \
-       libsystemd-daemon.la \
-       libudev.la \
-       libsystemd-shared.la \
-       libsystemd-label.la
-
-nodist_libsystemd_journal_internal_la_SOURCES = \
-       src/journal/journald-gperf.c
+       libsystemd-capability.la \
+       libsystemd-label.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 if ENABLE_LOGIND
-libsystemd_journal_internal_la_LIBADD += \
+libsystemd_journal_core_la_LIBADD += \
        libsystemd-login-internal.la
 endif
 
 if HAVE_ACL
-libsystemd_journal_internal_la_LIBADD += \
+libsystemd_journal_core_la_LIBADD += \
        libsystemd-acl.la
 endif
 
-if HAVE_XZ
-libsystemd_journal_la_SOURCES += \
-       src/journal/compress.c
-
-libsystemd_journal_la_CFLAGS += \
-       $(XZ_CFLAGS)
-
-libsystemd_journal_la_LIBADD += \
-       $(XZ_LIBS)
-
-libsystemd_journal_internal_la_CFLAGS += \
-       $(XZ_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD += \
-       $(XZ_LIBS)
-
-endif
+noinst_LTLIBRARIES += \
+       libsystemd-journal-core.la
 
 if HAVE_GCRYPT
 libsystemd_journal_la_SOURCES += \
@@ -3123,7 +3172,8 @@ tests += \
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
-       src/systemd/sd-messages.h
+       src/systemd/sd-messages.h \
+       src/systemd/_sd-common.h
 
 lib_LTLIBRARIES += \
        libsystemd-journal.la
@@ -3154,6 +3204,7 @@ pkgconfiglib_DATA += \
        src/journal/libsystemd-journal.pc
 
 dist_catalog_DATA = \
+       catalog/systemd-fr.catalog \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
@@ -3164,7 +3215,6 @@ SYSINIT_TARGET_WANTS += \
 
 EXTRA_DIST += \
        src/journal/libsystemd-journal.pc.in \
-       src/journal/libsystemd-journal.sym \
        units/systemd-journald.service.in \
        units/systemd-journal-flush.service.in \
        src/journal/journald-gperf.gperf
@@ -3185,17 +3235,17 @@ systemd_journal_gatewayd_SOURCES = \
        src/journal/microhttpd-util.c
 
 systemd_journal_gatewayd_LDADD = \
-       libsystemd-shared.la \
        libsystemd-logs.la \
        libsystemd-journal-internal.la \
        libsystemd-id128-internal.la \
-       libsystemd-daemon.la \
-       libsystemd-bus.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-bus-internal.la \
+       libsystemd-shared.la \
        $(MICROHTTPD_LIBS)
 
 systemd_journal_gatewayd_CFLAGS = \
-       -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
        $(AM_CFLAGS) \
+       -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
        $(MICROHTTPD_CFLAGS)
 
 dist_systemunit_DATA += \
@@ -3212,6 +3262,19 @@ endif
 EXTRA_DIST += \
        units/systemd-journal-gatewayd.service.in
 
+# ------------------------------------------------------------------------------
+
+systemd_socket_proxyd_SOURCES = \
+       src/socket-proxy/socket-proxyd.c
+
+systemd_socket_proxyd_LDADD = \
+       libsystemd-logs.la \
+       libsystemd-bus-internal.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -3234,10 +3297,9 @@ systemd_coredumpctl_SOURCES = \
        src/journal/coredumpctl.c
 
 systemd_coredumpctl_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal.la \
        libsystemd-journal-internal.la \
-       libsystemd-id128-internal.la
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 bin_PROGRAMS += \
        systemd-coredumpctl
@@ -3321,9 +3383,9 @@ systemd_readahead_SOURCES = \
        src/readahead/readahead-common.h
 
 systemd_readahead_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
-       libudev.la
+       libsystemd-daemon-internal.la \
+       libudev-internal.la \
+       libsystemd-shared.la
 
 dist_doc_DATA += \
        src/readahead/sd-readahead.c \
@@ -3359,8 +3421,8 @@ systemd_bootchart_SOURCES = \
        src/bootchart/svg.h
 
 systemd_bootchart_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-journal.la
+       libsystemd-journal-internal.la \
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-bootchart
@@ -3426,8 +3488,8 @@ systemd_backlight_SOURCES = \
 
 systemd_backlight_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libudev-private.la
+       libudev-internal.la \
+       libsystemd-shared.la
 endif
 
 EXTRA_DIST += \
@@ -3446,8 +3508,8 @@ systemd_rfkill_SOURCES = \
 
 systemd_rfkill_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libudev-private.la
+       libudev-internal.la \
+       libsystemd-shared.la
 endif
 
 EXTRA_DIST += \
@@ -3473,8 +3535,8 @@ systemd_cryptsetup_CFLAGS = \
 
 systemd_cryptsetup_LDADD = \
        libsystemd-label.la \
+       libudev-internal.la \
        libsystemd-shared.la \
-       libudev.la \
        $(LIBCRYPTSETUP_LIBS)
 
 systemd_cryptsetup_generator_SOURCES = \
@@ -3494,15 +3556,12 @@ if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
        src/hostname/hostnamed.c
 
-systemd_hostnamed_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_hostnamed_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-hostnamed
@@ -3519,28 +3578,17 @@ dist_dbussystemservice_DATA += \
 polkitpolicy_files += \
        src/hostname/org.freedesktop.hostname1.policy
 
-dbusinterface_DATA += \
-       org.freedesktop.hostname1.xml
-
-org.freedesktop.hostname1.xml: systemd-hostnamed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 SYSTEM_UNIT_ALIASES += \
        systemd-hostnamed.service dbus-org.freedesktop.hostname1.service
 
 hostnamectl_SOURCES = \
        src/hostname/hostnamectl.c
 
-hostnamectl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 hostnamectl_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-dbus.la \
-       libsystemd-id128-internal.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 bin_PROGRAMS += \
        hostnamectl
@@ -3564,15 +3612,12 @@ if ENABLE_LOCALED
 systemd_localed_SOURCES = \
        src/locale/localed.c
 
-systemd_localed_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_localed_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 nodist_systemunit_DATA += \
        units/systemd-localed.service
@@ -3589,14 +3634,6 @@ dist_dbussystemservice_DATA += \
 polkitpolicy_files += \
        src/locale/org.freedesktop.locale1.policy
 
-dbusinterface_DATA += \
-       org.freedesktop.locale1.xml
-
-org.freedesktop.locale1.xml: systemd-localed
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 SYSTEM_UNIT_ALIASES += \
        systemd-localed.service dbus-org.freedesktop.locale1.service
 
@@ -3612,14 +3649,11 @@ update-kbd-model-map: src/locale/generate-kbd-model-map
 localectl_SOURCES = \
        src/locale/localectl.c
 
-localectl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 localectl_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-dbus.la \
-       libsystemd-id128-internal.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 bin_PROGRAMS += \
        localectl
@@ -3643,15 +3677,12 @@ if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
        src/timedate/timedated.c
 
-systemd_timedated_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_timedated_LDADD = \
        libsystemd-label.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
        systemd-timedated
@@ -3668,14 +3699,6 @@ nodist_systemunit_DATA += \
 polkitpolicy_files += \
        src/timedate/org.freedesktop.timedate1.policy
 
-org.freedesktop.timedate1.xml: systemd-timedated
-       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
-               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-dbusinterface_DATA += \
-       org.freedesktop.timedate1.xml
-
 INSTALL_DIRS += \
        $(prefix)/lib/systemd/ntp-units.d \
        $(sysconfdir)/systemd/ntp-units.d
@@ -3686,13 +3709,11 @@ SYSTEM_UNIT_ALIASES += \
 timedatectl_SOURCES = \
        src/timedate/timedatectl.c
 
-timedatectl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 timedatectl_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-dbus.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 bin_PROGRAMS += \
        timedatectl
@@ -3717,9 +3738,6 @@ libnss_myhostname_la_SOURCES = \
        src/nss-myhostname/ifconf.h \
        src/nss-myhostname/netlink.c
 
-libnss_myhostname_la_CFLAGS = \
-       $(AM_CFLAGS)
-
 libnss_myhostname_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -module \
@@ -3738,12 +3756,8 @@ systemd_machined_SOURCES = \
        src/machine/machined.c \
        src/machine/machined.h
 
-systemd_machined_CFLAGS = \
-       $(libsystemd_machine_core_la_CFLAGS)
-
 systemd_machined_LDADD = \
-       libsystemd-machine-core.la \
-       $(libsystemd_machine_core_la_LIBADD)
+       libsystemd-machine-core.la
 
 rootlibexec_PROGRAMS += \
        systemd-machined
@@ -3754,18 +3768,14 @@ libsystemd_machine_core_la_SOURCES = \
        src/machine/machine.h \
        src/machine/machine-dbus.c
 
-libsystemd_machine_core_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-audit.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
-       libsystemd-dbus.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
-       libudev.la
+       libudev-internal.la \
+       libsystemd-shared.la
 
 noinst_LTLIBRARIES += \
        libsystemd-machine-core.la
@@ -3773,14 +3783,11 @@ noinst_LTLIBRARIES += \
 machinectl_SOURCES = \
        src/machine/machinectl.c
 
-machinectl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 machinectl_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-dbus.la \
-       libudev.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 rootbin_PROGRAMS += \
        machinectl
@@ -3788,10 +3795,6 @@ rootbin_PROGRAMS += \
 test_machine_tables_SOURCES = \
        src/machine/test-machine-tables.c
 
-test_machine_tables_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 test_machine_tables_LDADD = \
        libsystemd-machine-core.la
 
@@ -3821,6 +3824,63 @@ EXTRA_DIST += \
 
 endif
 
+# ------------------------------------------------------------------------------
+if ENABLE_NETWORKD
+rootlibexec_PROGRAMS += \
+       systemd-networkd
+
+systemd_networkd_SOURCES = \
+       src/network/networkd.h \
+       src/network/networkd.c \
+       src/network/networkd-link.c \
+       src/network/networkd-network.c \
+       src/network/networkd-address.c \
+       src/network/networkd-route.c \
+       src/network/networkd-manager.c
+
+nodist_systemd_networkd_SOURCES = \
+       src/network/networkd-gperf.c
+
+systemd_networkd_LDADD = \
+       libudev-internal.la \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-rtnl.la \
+       libsystemd-shared.la
+
+nodist_systemunit_DATA += \
+       units/systemd-networkd.service
+
+MULTI_USER_TARGET_WANTS += \
+       systemd-networkd.service
+
+test_network_SOURCES = \
+       src/network/test-network.c \
+       src/network/networkd.h \
+       src/network/networkd-link.c \
+       src/network/networkd-network.c \
+       src/network/networkd-address.c \
+       src/network/networkd-route.c \
+       src/network/networkd-manager.c \
+       src/network/networkd-gperf.c
+
+test_network_LDADD = \
+       libudev-internal.la \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-rtnl.la \
+       libsystemd-shared.la
+
+tests += test-network
+
+EXTRA_DIST += \
+       src/network/networkd-gperf.gperf \
+       units/systemd-networkd.service.in
+
+CLEANFILES += \
+       src/network/networkd-gperf.c
+endif
+
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
@@ -3830,16 +3890,11 @@ systemd_logind_SOURCES = \
 nodist_systemd_logind_SOURCES = \
        src/login/logind-gperf.c
 
-systemd_logind_CFLAGS = \
-       $(libsystemd_logind_core_la_CFLAGS)
-
 systemd_logind_LDADD = \
-       libsystemd-logind-core.la \
-       $(libsystemd_logind_core_la_LIBADD)
+       libsystemd-logind-core.la
 
 libsystemd_logind_core_la_SOURCES = \
        src/login/logind-core.c \
-       src/login/logind-dbus.c \
        src/login/logind-device.c \
        src/login/logind-device.h \
        src/login/logind-button.c \
@@ -3856,6 +3911,7 @@ libsystemd_logind_core_la_SOURCES = \
        src/login/logind-user.h \
        src/login/logind-inhibit.c \
        src/login/logind-inhibit.h \
+       src/login/logind-dbus.c \
        src/login/logind-session-dbus.c \
        src/login/logind-seat-dbus.c \
        src/login/logind-user-dbus.c \
@@ -3863,18 +3919,15 @@ libsystemd_logind_core_la_SOURCES = \
        src/login/login-shared.c \
        src/login/login-shared.h
 
-libsystemd_logind_core_la_CFLAGS = \
-       $(AM_CFLAGS) \
-        $(DBUS_CFLAGS)
-
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
+       libsystemd-capability.la \
        libsystemd-audit.la \
-       libsystemd-shared.la \
-       libsystemd-daemon.la \
-       libsystemd-dbus.la \
+       libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
-       libudev.la
+       libsystemd-bus-internal.la \
+       libudev-internal.la \
+       libsystemd-shared.la
 
 if HAVE_ACL
 libsystemd_logind_core_la_SOURCES += \
@@ -3901,14 +3954,12 @@ loginctl_SOURCES = \
        src/login/loginctl.c \
        src/login/sysfs-show.c
 
-loginctl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 loginctl_LDADD = \
+       libsystemd-bus-internal.la \
+       libudev-internal.la \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
-       libudev.la
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la
 
 rootbin_PROGRAMS += \
        loginctl
@@ -3923,13 +3974,11 @@ dist_zshcompletion_DATA += \
 systemd_inhibit_SOURCES = \
        src/login/inhibit.c
 
-systemd_inhibit_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_inhibit_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-dbus.la
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
 
 rootbin_PROGRAMS += \
        systemd-inhibit
@@ -3952,20 +4001,14 @@ test_inhibit_SOURCES = \
        src/login/test-inhibit.c
 
 test_inhibit_LDADD = \
-       libsystemd-shared.la \
-       libsystemd-dbus.la
-
-test_inhibit_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+       libsystemd-bus-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-shared.la
 
 test_login_tables_SOURCES = \
        src/login/test-login-tables.c
 
-test_login_tables_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 test_login_tables_LDADD = \
        libsystemd-logind-core.la
 
@@ -3978,6 +4021,7 @@ tests += \
        test-login-shared
 
 libsystemd_login_la_SOURCES = \
+       src/login/libsystemd-login.sym \
        src/login/sd-login.c \
        src/systemd/sd-login.h \
        src/login/login-shared.c \
@@ -3993,9 +4037,8 @@ libsystemd_login_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
 
 libsystemd_login_la_LIBADD = \
-       libsystemd-shared.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS)
+       libsystemd-shared.la
 
 libsystemd_login_internal_la_SOURCES = \
        $(libsystemd_login_la_SOURCES)
@@ -4007,7 +4050,6 @@ pam_systemd_la_SOURCES = \
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(PAM_CFLAGS) \
-       $(DBUS_CFLAGS) \
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -4019,11 +4061,12 @@ pam_systemd_la_LDFLAGS = \
        -export-symbols-regex '^pam_sm_.*'
 
 pam_systemd_la_LIBADD = \
+       libsystemd-capability.la \
        libsystemd-audit.la \
-       libsystemd-dbus.la \
-       libsystemd-shared.la \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS) \
+       libsystemd-shared.la \
        $(PAM_LIBS)
 
 pamlib_LTLIBRARIES = \
@@ -4114,7 +4157,6 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
        src/login/logind-gperf.gperf \
        src/login/libsystemd-login.pc.in \
-       src/login/libsystemd-login.sym \
        src/login/71-seat.rules.in \
        src/login/73-seat-late.rules.in \
        units/systemd-logind.service.in \
@@ -4210,9 +4252,8 @@ _reader_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
        libsystemd-journal.la \
        libsystemd-id128.la \
-       libsystemd-shared.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS)
+       libsystemd-shared.la
 
 login_la_SOURCES = \
        src/python-systemd/login.c \
@@ -4234,9 +4275,8 @@ login_la_LIBADD = \
        $(PYTHON_DEVEL_LIBS) \
        libsystemd-journal.la \
        libsystemd-login.la \
-       libsystemd-shared.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS)
+       libsystemd-shared.la
 
 dist_pkgpyexec_PYTHON = \
        src/python-systemd/journal.py \
@@ -4303,6 +4343,7 @@ substitutions = \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
+       '|RANDOM_SEED_DIR=$(localstatedir)/lib/systemd/|' \
        '|RANDOM_SEED=$(localstatedir)/lib/systemd/random-seed|' \
        '|prefix=$(prefix)|' \
        '|exec_prefix=$(exec_prefix)|' \
@@ -4443,11 +4484,6 @@ EXTRA_DIST += \
        man/custom-man.xsl
 
 # ------------------------------------------------------------------------------
-DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
-
-CLEANFILES += \
-       $(dbusinterface_DATA)
-
 if HAVE_SYSV_COMPAT
 sysvinit_DATA = \
        docs/sysvinit/README
@@ -4490,7 +4526,6 @@ SYSINIT_TARGET_WANTS += \
        systemd-update-utmp.service
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
-       systemd-fsck-root.service \
        tmp.mount
 MULTI_USER_TARGET_WANTS += \
        getty.target \
@@ -4548,6 +4583,8 @@ endif
 INSTALL_DIRS += \
        $(prefix)/lib/modules-load.d \
        $(sysconfdir)/modules-load.d \
+       $(prefix)/lib/systemd/network \
+       $(sysconfdir)/systemd/network \
        $(prefix)/lib/sysctl.d \
        $(sysconfdir)/sysctl.d \
        $(prefix)/lib/kernel/install.d \
@@ -4582,7 +4619,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
        --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
-       --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
        --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
@@ -4642,4 +4678,133 @@ install-tree: all
 # Let's run all tests of the test suite, but under valgrind. Let's
 # exclude the one perl script we have in there
 valgrind-tests: $(TESTS)
-       for f in $(TESTS) ; do [ "$$f" == "$${f/.pl/}" ] && libtool --mode=execute valgrind --leak-check=full --error-exitcode=55 $(builddir)/$$f ; done
+       $(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
+               echo "Running $$f"; \
+               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; \
+       done
+
+exported-%: %
+       $(AM_V_GEN)nm -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
+
+exported: $(addprefix exported-, $(lib_LTLIBRARIES))
+       $(AM_V_GEN)cat $^ > $@
+
+check-api-docs: exported man
+       $(AM_V_GEN)for symbol in `cat exported` ; do \
+               if test -f $(builddir)/man/$$symbol.html ; then \
+                       echo "  Symbol $$symbol() is documented." ; \
+               else \
+                       echo "‣ Symbol $$symbol() lacks documentation." ; \
+               fi ; \
+       done
+
+OBJECT_VARIABLES:=$(filter %_OBJECTS,$(.VARIABLES))
+ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v)))
+
+undefined defined: $(ALL_OBJECTS)
+       $(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \
+               nm -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \
+       done | cut -c 20- | cut -d @ -f 1 | sort -u > $@
+
+CLEANFILES += \
+       defined \
+       undefined
+
+check-api-unused: defined undefined exported
+       ( cat exported undefined ) | sort -u  | diff -u - defined | grep ^+ | grep -v ^+++ | cut -c2-
+
+# Stupid test that everything purported to be exported really is
+
+define generate-sym-test
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
+       $(AM_V_at)printf '#include <stdio.h>\n' > $@
+       $(AM_V_at)printf '#include "%s"\n' $(notdir $(filter %.h, $^)) >> $@
+       $(AM_V_at)printf 'void* functions[] = {\n' >> $@
+       $(AM_V_GEN)sed -r -n 's/^ +([a-zA-Z0-9_]+);/\1,/p' $< >> $@
+       $(AM_V_at)printf '};\nint main(void) {\n' >> $@
+       $(AM_V_at)printf 'unsigned i; for (i=0;i<sizeof(functions)/sizeof(void*);i++) printf("%%p\\n", functions[i]);\n' >> $@
+       $(AM_V_at)printf 'return 0; }\n' >> $@
+endef
+
+test-libsystemd-bus-sym.c: \
+       src/libsystemd-bus/libsystemd-bus.sym \
+       src/systemd/sd-bus.h \
+       src/systemd/sd-utf8.h \
+       Makefile
+       $(generate-sym-test)
+
+test-libsystemd-daemon-sym.c: \
+       src/libsystemd-daemon/libsystemd-daemon.sym \
+       src/systemd/sd-daemon.h \
+       Makefile
+       $(generate-sym-test)
+
+test-libsystemd-id128-sym.c: \
+       src/libsystemd-id128/libsystemd-id128.sym \
+       src/systemd/sd-id128.h \
+       Makefile
+       $(generate-sym-test)
+
+test-libsystemd-journal-sym.c: \
+       src/journal/libsystemd-journal.sym \
+       src/systemd/sd-journal.h \
+       Makefile
+       $(generate-sym-test)
+
+test-libsystemd-login-sym.c: \
+       src/login/libsystemd-login.sym \
+       src/systemd/sd-login.h \
+       Makefile
+       $(generate-sym-test)
+
+test-libudev-sym.c: \
+       src/libudev/libudev.sym \
+       src/udev/udev.h \
+       Makefile
+       $(generate-sym-test)
+
+test_libsystemd_bus_sym_SOURCES = \
+       test-libsystemd-bus-sym.c
+test_libsystemd_bus_sym_LDADD = \
+       libsystemd-bus.la
+
+test_libsystemd_daemon_sym_SOURCES = \
+       test-libsystemd-daemon-sym.c
+test_libsystemd_daemon_sym_LDADD = \
+       libsystemd-daemon.la
+
+test_libsystemd_id128_sym_SOURCES = \
+       test-libsystemd-id128-sym.c
+test_libsystemd_id128_sym_LDADD = \
+       libsystemd-id128.la
+
+test_libsystemd_journal_sym_SOURCES = \
+       test-libsystemd-journal-sym.c
+test_libsystemd_journal_sym_LDADD = \
+       libsystemd-journal.la
+
+test_libsystemd_login_sym_SOURCES = \
+       test-libsystemd-login-sym.c
+test_libsystemd_login_sym_LDADD = \
+       libsystemd-login.la
+
+test_libudev_sym_SOURCES = \
+       test-libudev-sym.c
+test_libudev_sym_LDADD = \
+       libudev.la
+
+BUILT_SOURCES += \
+       $(test_libsystemd_bus_sym_SOURCES) \
+       $(test_libsystemd_daemon_sym_SOURCES) \
+       $(test_libsystemd_id128_sym_SOURCES) \
+       $(test_libsystemd_journal_sym_SOURCES) \
+       $(test_libsystemd_login_sym_SOURCES) \
+       $(test_libudev_sym_SOURCES)
+
+tests += \
+       test-libsystemd-bus-sym \
+       test-libsystemd-daemon-sym \
+       test-libsystemd-id128-sym \
+       test-libsystemd-journal-sym \
+       test-libsystemd-login-sym \
+       test-libudev-sym