X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e6d5723205d6f9a650fe7c60beeffb846a5b19ba;hp=b337f4f09b8be515903e7604fa5971acd51dbb40;hb=f579559b3a14c1f1ef96c372e7626c4733e6ef7d;hpb=66a4c743c070761ee8696aa6302445fecf358441

diff --git a/Makefile.am b/Makefile.am
index b337f4f09..e6d572320 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,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
@@ -84,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
@@ -127,7 +131,6 @@ nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
 dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
-dbusinterface_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
@@ -174,6 +177,7 @@ AM_CPPFLAGS = \
 	-DKEXEC=\"$(KEXEC)\" \
 	-I $(top_srcdir)/src \
 	-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 \
@@ -181,8 +185,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)
@@ -299,8 +305,7 @@ bin_PROGRAMS = \
 	systemd-detect-virt \
 	systemd-delta \
 	systemd-analyze \
-	systemd-run \
-	systemd-saproxy
+	systemd-run
 
 dist_bin_SCRIPTS = \
 	src/kernel-install/kernel-install
@@ -321,24 +326,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 \
@@ -354,6 +349,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
@@ -427,6 +423,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 \
@@ -469,6 +466,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 \
@@ -499,12 +497,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
@@ -631,6 +629,27 @@ 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-shared.la
+
+tests += test-rtnl
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-shared.la
@@ -734,7 +753,11 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/apparmor-util.c \
 	src/shared/apparmor-util.h \
 	src/shared/ima-util.c \
-	src/shared/ima-util.h
+	src/shared/ima-util.h \
+	src/shared/ptyfwd.c \
+	src/shared/ptyfwd.h \
+	src/shared/net-util.c \
+	src/shared/net-util.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -742,11 +765,7 @@ noinst_LTLIBRARIES += \
 
 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
+	src/shared/dbus-common.h
 
 libsystemd_dbus_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -806,14 +825,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
@@ -837,9 +848,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 += \
@@ -854,8 +862,7 @@ libsystemd_acl_la_CFLAGS = \
 	$(ACL_CFLAGS)
 
 libsystemd_acl_la_LIBADD = \
-	$(ACL_LIBS) \
-	libsystemd-shared.la
+	$(ACL_LIBS)
 endif
 
 # ------------------------------------------------------------------------------
@@ -1011,12 +1018,12 @@ 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 \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS) \
 	$(AUDIT_LIBS) \
@@ -1067,9 +1074,7 @@ systemd_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 \
@@ -1081,29 +1086,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
 
@@ -1142,6 +1127,7 @@ tests += \
 	test-utf8 \
 	test-ellipsize \
 	test-util \
+	test-namespace \
 	test-date \
 	test-sleep \
 	test-replace-var \
@@ -1182,8 +1168,7 @@ test_engine_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
@@ -1194,7 +1179,7 @@ test_job_type_CFLAGS = \
 
 test_job_type_LDADD = \
 	libsystemd-core.la \
-	libsystemd-daemon.la
+	$(RT_LIBS)
 
 test_ns_SOURCES = \
 	src/test/test-ns.c
@@ -1210,7 +1195,6 @@ test_loopback_SOURCES = \
 	src/test/test-loopback.c
 
 test_loopback_LDADD = \
-	libsystemd-shared.la \
 	libsystemd-core.la
 
 test_hostname_SOURCES = \
@@ -1238,7 +1222,8 @@ test_unit_name_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
@@ -1248,41 +1233,36 @@ test_unit_file_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
 
@@ -1295,33 +1275,26 @@ test_tables_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
 
@@ -1371,8 +1344,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
@@ -1386,8 +1359,8 @@ test_cgroup_util_SOURCES = \
 
 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
@@ -1405,9 +1378,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
@@ -1431,8 +1404,8 @@ test_install_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
@@ -1450,7 +1423,7 @@ test_sched_prio_CFLAGS = \
 
 test_sched_prio_LDADD = \
 	libsystemd-core.la \
-	libsystemd-daemon.la
+	$(RT_LIBS)
 
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
@@ -1490,18 +1463,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 = \
@@ -1509,12 +1489,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)
 
 # ------------------------------------------------------------------------------
@@ -1523,10 +1504,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
 
 # ------------------------------------------------------------------------------
@@ -1541,8 +1522,8 @@ systemd_shutdown_SOURCES = \
 
 systemd_shutdown_LDADD = \
 	libsystemd-label.la \
-	libsystemd-shared.la \
-	libudev.la
+	libudev-internal.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 if HAVE_KMOD
@@ -1588,9 +1569,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
@@ -1641,8 +1622,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 = \
@@ -1662,22 +1643,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 = \
@@ -1746,8 +1725,8 @@ bootctl_SOURCES = \
 
 bootctl_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-id128.la \
-	libsystemd-daemon.la
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la
 
 bin_PROGRAMS += \
 	bootctl
@@ -1763,9 +1742,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 = \
@@ -1795,29 +1774,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 = \
@@ -1825,8 +1801,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 = \
@@ -1868,10 +1844,10 @@ 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
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -1880,19 +1856,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 = \
@@ -1909,6 +1886,10 @@ libsystemd_daemon_la_SOURCES = \
 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 \
@@ -1954,6 +1935,7 @@ libsystemd_bus_la_SOURCES = \
 	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 \
@@ -1966,6 +1948,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 \
@@ -1983,23 +1967,45 @@ 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 \
+	src/libsystemd-bus/libsystemd-bus.sym
+
+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
+
 tests += \
 	test-bus-marshal \
 	test-bus-signature \
@@ -2015,15 +2021,17 @@ tests += \
 	test-bus-objects \
 	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 \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS)
 
@@ -2037,7 +2045,7 @@ test_bus_signature_SOURCES = \
 
 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
@@ -2047,9 +2055,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
@@ -2059,9 +2068,10 @@ 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
@@ -2071,98 +2081,87 @@ test_bus_objects_CFLAGS = \
 	-pthread
 
 test_bus_objects_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_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-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_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-shared.la \
-	libsystemd-bus.la
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-shared.la
 
 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-shared.la \
-	libsystemd-bus.la
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
@@ -2202,9 +2201,9 @@ libudev_la_LDFLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
 
 libudev_la_LIBADD = \
-	libsystemd-shared.la \
 	libsystemd-daemon-internal.la \
-	libsystemd-id128-internal.la
+	libsystemd-id128-internal.la \
+	libsystemd-shared.la
 
 pkgconfiglib_DATA += \
 	src/libudev/libudev.pc
@@ -2238,29 +2237,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 \
@@ -2271,7 +2271,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 = \
@@ -2352,19 +2352,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) \
@@ -2372,9 +2382,11 @@ libudev_core_la_CFLAGS = \
 	$(KMOD_CFLAGS)
 
 libudev_core_la_LIBADD = \
-	libudev-private.la \
+	libudev-internal.la \
 	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
+	libsystemd-rtnl.la \
+	libsystemd-id128-internal.la \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
@@ -2435,9 +2447,7 @@ udevadm_SOURCES = \
 	src/udev/udevadm-test-builtin.c
 
 udevadm_LDADD = \
-	libudev-core.la \
-	libsystemd-label.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.
@@ -2464,15 +2474,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)
@@ -2505,7 +2514,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 += \
@@ -2516,7 +2525,7 @@ cdrom_id_SOURCES = \
 	src/udev/cdrom_id/cdrom_id.c
 
 cdrom_id_LDADD = \
-	libudev.la \
+	libudev-internal.la \
 	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -2530,7 +2539,8 @@ collect_SOURCES = \
 	src/udev/collect/collect.c
 
 collect_LDADD = \
-	libudev-private.la
+	libudev-internal.la \
+	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
 	collect
@@ -2543,7 +2553,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 += \
@@ -2557,7 +2567,7 @@ v4l_id_SOURCES = \
 	src/udev/v4l_id/v4l_id.c
 
 v4l_id_LDADD = \
-	libudev.la
+	libudev-internal.la
 
 udevlibexec_PROGRAMS += \
 	v4l_id
@@ -2570,7 +2580,7 @@ accelerometer_SOURCES = \
 	src/udev/accelerometer/accelerometer.c
 
 accelerometer_LDADD = \
-	libudev.la -lm \
+	libudev-internal.la -lm \
 	libsystemd-shared.la
 
 udevlibexec_PROGRAMS += \
@@ -2674,13 +2684,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
 
@@ -2772,9 +2783,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
@@ -2814,8 +2825,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 +2835,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 +2877,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,10 +2941,7 @@ 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/sd-journal.c \
@@ -2986,14 +2973,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 \
@@ -3010,46 +3021,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_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 += \
@@ -3186,17 +3182,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 += \
@@ -3215,19 +3211,16 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
-systemd_saproxy_SOURCES = \
-	src/saproxy/saproxy.c
+systemd_socket_proxyd_SOURCES = \
+	src/socket-proxy/socket-proxyd.c
 
-systemd_saproxy_LDADD = \
-	libsystemd-shared.la \
+systemd_socket_proxyd_LDADD = \
 	libsystemd-logs.la \
+	libsystemd-bus-internal.la \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la \
-	libsystemd-daemon.la \
-	libsystemd-bus.la
-
-systemd_saproxy_CFLAGS = \
-	$(AM_CFLAGS)
+	libsystemd-daemon-internal.la \
+	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
@@ -3251,10 +3244,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
@@ -3338,9 +3330,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 \
@@ -3376,8 +3368,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
@@ -3443,8 +3435,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 += \
@@ -3463,8 +3455,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 += \
@@ -3490,8 +3482,8 @@ systemd_cryptsetup_CFLAGS = \
 
 systemd_cryptsetup_LDADD = \
 	libsystemd-label.la \
+	libudev-internal.la \
 	libsystemd-shared.la \
-	libudev.la \
 	$(LIBCRYPTSETUP_LIBS)
 
 systemd_cryptsetup_generator_SOURCES = \
@@ -3513,9 +3505,10 @@ systemd_hostnamed_SOURCES = \
 
 systemd_hostnamed_LDADD = \
 	libsystemd-label.la \
-	libsystemd-shared.la \
-	libsystemd-daemon.la \
-	libsystemd-bus.la
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
 	systemd-hostnamed
@@ -3532,28 +3525,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
@@ -3577,15 +3559,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
@@ -3602,14 +3581,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
 
@@ -3625,14 +3596,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
@@ -3658,9 +3626,10 @@ systemd_timedated_SOURCES = \
 
 systemd_timedated_LDADD = \
 	libsystemd-label.la \
-	libsystemd-shared.la \
-	libsystemd-daemon.la \
-	libsystemd-bus.la
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-shared.la
 
 rootlibexec_PROGRAMS += \
 	systemd-timedated
@@ -3677,14 +3646,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
@@ -3695,13 +3656,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
@@ -3726,9 +3685,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 \
@@ -3747,12 +3703,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
@@ -3763,18 +3715,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
@@ -3782,14 +3730,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
@@ -3797,10 +3742,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
 
@@ -3830,6 +3771,59 @@ EXTRA_DIST += \
 
 endif
 
+# ------------------------------------------------------------------------------
+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.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.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
+
 # ------------------------------------------------------------------------------
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
@@ -3839,12 +3833,8 @@ 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 \
@@ -3872,18 +3862,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 += \
@@ -3910,14 +3897,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
@@ -3932,13 +3917,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
@@ -3961,20 +3944,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
 
@@ -4002,9 +3979,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)
@@ -4016,7 +3992,6 @@ pam_systemd_la_SOURCES = \
 pam_systemd_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(PAM_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	-fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -4028,11 +4003,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 = \
@@ -4219,9 +4195,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 \
@@ -4243,9 +4218,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 \
@@ -4452,11 +4426,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
@@ -4499,7 +4468,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 \
@@ -4557,6 +4525,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 \
@@ -4591,7 +4561,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) \
@@ -4651,4 +4620,35 @@ 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
+	for f in $(TESTS) ; do \
+		[ "$$f" == "$${f/.pl/}" ] && libtool --mode=execute valgrind --leak-check=full --error-exitcode=55 $(builddir)/$$f ; \
+	done
+
+check-api-docs: $(lib_LTLIBRARIES) man
+	for symbol in `for f in $(lib_LTLIBRARIES) ; do nm -g --defined-only $(builddir)/.libs/"$${f/.la/.so}" 2>&1 /dev/null | grep " T " | cut -d" " -f3 ; done` ; 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)))
+
+defined: $(ALL_OBJECTS)
+	$(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \
+		nm -g --undefined-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \
+	done | cut -c 20- | cut -d @ -f 1 | sort -u > $(builddir)/undefined
+
+undefined: $(ALL_OBJECTS)
+	$(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \
+		nm -g --defined-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \
+	done | cut -c 20- | cut -d @ -f 1 | sort -u > $(builddir)/defined
+
+CLEANFILES += \
+	defined \
+	undefined
+
+check-api-unused: defined undefined
+	diff -u undefined defined | grep ^+ | grep -v ^+++ | cut -c2-