X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=fcde54e379f126c9ba0d3eebff08984d3776ae31;hp=0de03fe76efe814e412eb00744f52b74eeb029f1;hb=f58ceb21e9cdc4b79586283743351750ae35c175;hpb=e4afbb3eac5b20cf2fdf240af1caa576600ce152

diff --git a/Makefile.am b/Makefile.am
index 0de03fe76..fcde54e37 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -219,7 +219,10 @@ LOCAL_FS_TARGET_WANTS =
 MULTI_USER_TARGET_WANTS =
 SYSINIT_TARGET_WANTS =
 SOCKETS_TARGET_WANTS =
+BUSNAMES_TARGET_WANTS =
 TIMERS_TARGET_WANTS =
+USER_SOCKETS_TARGET_WANTS =
+USER_BUSNAMES_TARGET_WANTS =
 
 SYSTEM_UNIT_ALIASES =
 USER_UNIT_ALIASES =
@@ -227,22 +230,25 @@ USER_UNIT_ALIASES =
 GENERAL_ALIASES =
 
 install-target-wants-hook:
-	what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && $(add-wants)
-	what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && $(add-wants)
-	what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && $(add-wants)
-	what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && $(add-wants)
-	what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && $(add-wants)
-	what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && $(add-wants)
-	what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants)
-	what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
-	what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
-	what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
-	what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
-	what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
+	what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
+	what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+	what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
 
 define add-wants
 	[ -z "$$what" ] || ( \
-	  dir=$(DESTDIR)$(systemunitdir)/$$wants.wants && \
+	  dir=$(DESTDIR)$$dir/$$wants.wants && \
 	  $(MKDIR_P) -m 0755 $$dir && \
 	  cd $$dir && \
 	  rm -f $$what && \
@@ -393,6 +399,7 @@ dist_systemunit_DATA = \
 	units/sigpwr.target \
 	units/sleep.target \
 	units/sockets.target \
+	units/busnames.target \
 	units/timers.target \
 	units/paths.target \
 	units/suspend.target \
@@ -457,6 +464,7 @@ nodist_systemunit_DATA = \
 	units/systemd-nspawn@.service
 
 dist_userunit_DATA = \
+	units/user/basic.target \
 	units/user/default.target \
 	units/user/exit.target
 
@@ -505,7 +513,8 @@ CLEANFILES += \
 	units/console-shell.service.m4 \
 	units/console-getty.service.m4 \
 	units/container-getty@.service.m4 \
-	units/rescue.service.m4
+	units/rescue.service.m4 \
+	units/user@.service.m4
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
@@ -649,10 +658,12 @@ test_rtnl_SOURCES = \
 test_rtnl_LDADD = \
 	libsystemd-rtnl.la \
 	libsystemd-bus-internal.la \
+	libsystemd-daemon-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-shared.la
 
-tests += test-rtnl
+tests += \
+	test-rtnl
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -689,6 +700,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/time-util.h \
 	src/shared/hashmap.c \
 	src/shared/hashmap.h \
+	src/shared/siphash24.c \
+	src/shared/siphash24.h \
 	src/shared/set.c \
 	src/shared/set.h \
 	src/shared/fdset.c \
@@ -748,8 +761,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/fileio.c \
 	src/shared/fileio.h \
 	src/shared/output-mode.h \
-	src/shared/MurmurHash3.c \
-	src/shared/MurmurHash3.h \
+	src/shared/MurmurHash2.c \
+	src/shared/MurmurHash2.h \
 	src/shared/acpi-fpdt.h \
 	src/shared/acpi-fpdt.c \
 	src/shared/boot-timestamps.h \
@@ -771,7 +784,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/syscall-list.c \
 	src/shared/syscall-list.h \
 	src/shared/audit.c \
-	src/shared/audit.h
+	src/shared/audit.h \
+	src/shared/xml.c \
+	src/shared/xml.h
 
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
@@ -793,9 +808,6 @@ libsystemd_units_la_SOURCES = \
 	src/shared/specifier.c \
 	src/shared/specifier.h
 
-libsystemd_units_la_CFLAGS = \
-	$(AM_CFLAGS)
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-label.la
@@ -880,20 +892,22 @@ libsystemd_core_la_SOURCES = \
 	src/core/load-fragment.h \
 	src/core/service.c \
 	src/core/service.h \
-	src/core/automount.c \
-	src/core/automount.h \
-	src/core/mount.c \
-	src/core/mount.h \
-	src/core/swap.c \
-	src/core/swap.h \
-	src/core/device.c \
-	src/core/device.h \
+	src/core/socket.c \
+	src/core/socket.h \
+	src/core/busname.c \
+	src/core/busname.h \
 	src/core/target.c \
 	src/core/target.h \
 	src/core/snapshot.c \
 	src/core/snapshot.h \
-	src/core/socket.c \
-	src/core/socket.h \
+	src/core/device.c \
+	src/core/device.h \
+	src/core/mount.c \
+	src/core/mount.h \
+	src/core/automount.c \
+	src/core/automount.h \
+	src/core/swap.c \
+	src/core/swap.h \
 	src/core/timer.c \
 	src/core/timer.h \
 	src/core/path.c \
@@ -920,20 +934,22 @@ libsystemd_core_la_SOURCES = \
 	src/core/dbus-service.h \
 	src/core/dbus-socket.c \
 	src/core/dbus-socket.h \
-	src/core/dbus-timer.c \
-	src/core/dbus-timer.h \
+	src/core/dbus-busname.c \
+	src/core/dbus-busname.h \
 	src/core/dbus-target.c \
 	src/core/dbus-target.h \
+	src/core/dbus-snapshot.c \
+	src/core/dbus-snapshot.h \
+	src/core/dbus-device.c \
+	src/core/dbus-device.h \
 	src/core/dbus-mount.c \
 	src/core/dbus-mount.h \
 	src/core/dbus-automount.c \
 	src/core/dbus-automount.h \
 	src/core/dbus-swap.c \
 	src/core/dbus-swap.h \
-	src/core/dbus-snapshot.c \
-	src/core/dbus-snapshot.h \
-	src/core/dbus-device.c \
-	src/core/dbus-device.h \
+	src/core/dbus-timer.c \
+	src/core/dbus-timer.h \
 	src/core/dbus-path.c \
 	src/core/dbus-path.h \
 	src/core/dbus-slice.c \
@@ -1147,7 +1163,8 @@ tests += \
 	test-hashmap \
 	test-list \
 	test-tables \
-	test-device-nodes
+	test-device-nodes \
+	test-xml
 
 EXTRA_DIST += \
 	test/sched_idle_bad.service \
@@ -1249,6 +1266,12 @@ test_hashmap_SOURCES = \
 test_hashmap_LDADD = \
 	libsystemd-core.la
 
+test_xml_SOURCES = \
+	src/test/test-xml.c
+
+test_xml_LDADD = \
+	libsystemd-shared.la
+
 test_list_SOURCES = \
 	src/test/test-list.c
 
@@ -1342,10 +1365,9 @@ test_cgroup_LDADD = \
 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_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DTEST_DIR=\"$(abs_top_srcdir)/test\"
 
 test_cgroup_mask_LDADD = \
 	libsystemd-core.la \
@@ -1409,9 +1431,9 @@ test_watchdog_LDADD = \
 test_sched_prio_SOURCES = \
 	src/test/test-sched-prio.c
 
-test_sched_prio_CFLAGS = \
-	$(AM_CFLAGS) \
-	-D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)"
+test_sched_prio_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DTEST_DIR=\"$(abs_top_srcdir)/test\"
 
 test_sched_prio_LDADD = \
 	libsystemd-core.la \
@@ -1555,11 +1577,10 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
-	src/tmpfiles/tmpfiles.c \
-	src/shared/specifier.c \
-	src/shared/specifier.h
+	src/tmpfiles/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
+	libsystemd-units.la \
 	libsystemd-label.la \
 	libsystemd-capability.la \
 	libsystemd-id128-internal.la \
@@ -1578,6 +1599,7 @@ nodist_systemunit_DATA += \
 
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
+	tmpfiles.d/systemd-nologin.conf \
 	tmpfiles.d/tmp.conf \
 	tmpfiles.d/x11.conf
 
@@ -1748,6 +1770,27 @@ systemd_gpt_auto_generator_CFLAGS = \
 	$(BLKID_CFLAGS)
 endif
 
+# ------------------------------------------------------------------------------
+systemgenerator_PROGRAMS +=  \
+	systemd-dbus1-generator
+
+systemd_dbus1_generator_SOURCES = \
+	src/dbus1-generator/dbus1-generator.c
+
+systemd_dbus1_generator_LDADD = \
+	libsystemd-label.la \
+	libsystemd-shared.la \
+	libsystemd-bus-internal.la
+
+dbus1-generator-install-hook:
+	$(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+
+dbus1-generator-uninstall-hook:
+	rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+
+INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
+UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
+
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
 	src/rc-local-generator/rc-local-generator.c
@@ -1875,13 +1918,29 @@ systemd_bus_proxyd_LDADD = \
 	libsystemd-shared.la
 
 bus-proxyd-install-hook:
-	$(AM_V_LN)$(LN_S) -f ../../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+	$(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
 
 bus-proxyd-uninstall-hook:
 	rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
 
 INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
 UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
+
+if ENABLE_KDBUS
+nodist_systemunit_DATA += \
+	units/systemd-bus-proxyd@.service
+
+dist_systemunit_DATA += \
+	units/systemd-bus-proxyd.socket
+
+dist_userunit_DATA += \
+	units/user/systemd-bus-proxyd.socket \
+	units/user/systemd-bus-proxyd@.service
+endif
+
+EXTRA_DIST += \
+	units/systemd-bus-proxyd@.service.in
+
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
 	src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -1978,6 +2037,8 @@ libsystemd_bus_la_SOURCES = \
 	src/libsystemd-bus/bus-introspect.h \
 	src/libsystemd-bus/bus-objects.c \
 	src/libsystemd-bus/bus-objects.h \
+	src/libsystemd-bus/bus-gvariant.c \
+	src/libsystemd-bus/bus-gvariant.h \
 	src/libsystemd-bus/bus-convenience.c \
 	src/libsystemd-bus/kdbus.h \
 	src/libsystemd-bus/sd-memfd.c \
@@ -1985,7 +2046,11 @@ libsystemd_bus_la_SOURCES = \
 	src/libsystemd-bus/bus-util.h \
 	src/libsystemd-bus/sd-utf8.c \
 	src/libsystemd-bus/sd-event.c \
-	src/libsystemd-bus/event-util.h
+	src/libsystemd-bus/event-util.h \
+	src/libsystemd-bus/bus-protocol.h
+
+nodist_libsystemd_bus_la_SOURCES = \
+	src/libsystemd-bus/bus-error-mapping.c
 
 libsystemd_bus_la_LIBADD = \
 	libsystemd-id128-internal.la \
@@ -2005,7 +2070,13 @@ pkgconfiglib_DATA += \
 	src/libsystemd-bus/libsystemd-bus.pc
 
 EXTRA_DIST += \
-	src/libsystemd-bus/libsystemd-bus.pc.in
+	src/libsystemd-bus/bus-error-mapping.gperf \
+	src/libsystemd-bus/libsystemd-bus.pc.in \
+	src/libsystemd-bus/DIFFERENCES \
+	src/libsystemd-bus/GVARIANT-SERIALIZATION
+
+CLEANFILES += \
+	src/libsystemd-bus/bus-error-mapping.c
 
 lib_LTLIBRARIES += \
 	libsystemd-bus.la
@@ -2013,6 +2084,9 @@ lib_LTLIBRARIES += \
 libsystemd_bus_internal_la_SOURCES = \
 	$(libsystemd_bus_la_SOURCES)
 
+nodist_libsystemd_bus_internal_la_SOURCES = \
+	$(nodist_libsystemd_bus_la_SOURCES)
+
 libsystemd_bus_internal_la_CFLAGS = \
 	$(libsystemd_bus_la_CFLAGS)
 
@@ -2024,7 +2098,7 @@ libsystemd_bus_dump_la_SOURCES = \
 	src/libsystemd-bus/bus-dump.h
 
 libsystemd_bus_dump_la_CFLAGS = \
-	$(AM_CFLAGS)
+	$(AM_CFLAGS) \
 	$(CAP_CFLAGS)
 
 noinst_LTLIBRARIES += \
@@ -2045,6 +2119,7 @@ tests += \
 	test-bus-objects \
 	test-bus-error \
 	test-bus-creds \
+	test-bus-gvariant \
 	test-event
 
 bin_PROGRAMS += \
@@ -2129,6 +2204,24 @@ test_bus_error_LDADD = \
 	libsystemd-daemon-internal.la \
 	libsystemd-shared.la
 
+test_bus_gvariant_SOURCES = \
+	src/libsystemd-bus/test-bus-gvariant.c
+
+test_bus_gvariant_LDADD = \
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-shared.la \
+	libsystemd-bus-dump.la \
+	libsystemd-capability.la \
+	$(GLIB_LIBS) \
+	$(CAP_LIBS)
+
+test_bus_gvariant_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(GLIB_CFLAGS)
+	$(CAP_CFLAGS)
+
 test_bus_creds_SOURCES = \
 	src/libsystemd-bus/test-bus-creds.c
 
@@ -2354,6 +2447,8 @@ dist_udevhwdb_DATA = \
 	hwdb/20-pci-classes.hwdb \
 	hwdb/20-usb-vendor-model.hwdb \
 	hwdb/20-usb-classes.hwdb \
+	hwdb/20-sdio-vendor-model.hwdb \
+	hwdb/20-sdio-classes.hwdb \
 	hwdb/20-bluetooth-vendor-product.hwdb \
 	hwdb/20-acpi-vendor.hwdb \
 	hwdb/20-OUI.hwdb \
@@ -2908,7 +3003,9 @@ systemd_journald_SOURCES = \
 	src/journal/journald-server.h
 
 systemd_journald_LDADD = \
-	libsystemd-journal-core.la
+	libsystemd-journal-core.la \
+	libsystemd-bus-internal.la \
+	libsystemd-shared.la
 
 systemd_cat_SOURCES = \
 	src/journal/cat.c
@@ -3015,8 +3112,8 @@ test_mmap_cache_LDADD = \
 test_catalog_SOURCES = \
 	src/journal/test-catalog.c
 
-test_catalog_CFLAGS = \
-	$(AM_CFLAGS) \
+test_catalog_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
 	-DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\"
 
 test_catalog_LDADD = \
@@ -3231,9 +3328,9 @@ pkgconfiglib_DATA += \
 	src/journal/libsystemd-journal.pc
 
 dist_catalog_DATA = \
-	catalog/systemd-fr.catalog \
-	catalog/systemd-ru.catalog \
-	catalog/systemd-it.catalog \
+	catalog/systemd.fr.catalog \
+	catalog/systemd.ru.catalog \
+	catalog/systemd.it.catalog \
 	catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
@@ -3274,9 +3371,12 @@ systemd_journal_gatewayd_LDADD = \
 
 systemd_journal_gatewayd_CFLAGS = \
 	$(AM_CFLAGS) \
-	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
 	$(MICROHTTPD_CFLAGS)
 
+systemd_journal_gatewayd_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
+
 dist_systemunit_DATA += \
 	units/systemd-journal-gatewayd.socket
 
@@ -3598,6 +3698,9 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
 	units/systemd-hostnamed.service
 
+dist_systemunit_DATA += \
+	units/org.freedesktop.hostname1.busname
+
 dist_dbuspolicy_DATA += \
 	src/hostname/org.freedesktop.hostname1.conf
 
@@ -3610,6 +3713,9 @@ polkitpolicy_files += \
 SYSTEM_UNIT_ALIASES += \
 	systemd-hostnamed.service dbus-org.freedesktop.hostname1.service
 
+BUSNAMES_TARGET_WANTS += \
+	org.freedesktop.hostname1.busname
+
 hostnamectl_SOURCES = \
 	src/hostname/hostnamectl.c
 
@@ -3636,6 +3742,43 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-hostnamed.service.in
 
+# ------------------------------------------------------------------------------
+if ENABLE_KDBUS
+systemd_bus_driverd_SOURCES = \
+	src/bus-driverd/bus-driverd.c
+
+systemd_bus_driverd_LDADD = \
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-shared.la
+
+rootlibexec_PROGRAMS += \
+	systemd-bus-driverd
+
+nodist_systemunit_DATA += \
+	units/systemd-bus-driverd.service
+
+dist_systemunit_DATA += \
+	units/org.freedesktop.DBus.busname
+
+BUSNAMES_TARGET_WANTS += \
+	org.freedesktop.DBus.busname
+
+nodist_userunit_DATA += \
+	units/user/systemd-bus-driverd.service
+
+USER_BUSNAMES_TARGET_WANTS += \
+	org.freedesktop.DBus.busname
+
+USER_UNIT_ALIASES += \
+	$(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname
+endif
+
+EXTRA_DIST += \
+	units/systemd-bus-driverd.service.in \
+	units/user/systemd-bus-driverd.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
@@ -3651,6 +3794,9 @@ systemd_localed_LDADD = \
 nodist_systemunit_DATA += \
 	units/systemd-localed.service
 
+dist_systemunit_DATA += \
+	units/org.freedesktop.locale1.busname
+
 rootlibexec_PROGRAMS += \
 	systemd-localed
 
@@ -3666,6 +3812,9 @@ polkitpolicy_files += \
 SYSTEM_UNIT_ALIASES += \
 	systemd-localed.service dbus-org.freedesktop.locale1.service
 
+BUSNAMES_TARGET_WANTS += \
+	org.freedesktop.locale1.busname
+
 dist_pkgdata_DATA += \
 	src/locale/kbd-model-map
 
@@ -3725,6 +3874,9 @@ dist_dbuspolicy_DATA += \
 nodist_systemunit_DATA += \
 	units/systemd-timedated.service
 
+dist_systemunit_DATA += \
+	units/org.freedesktop.timedate1.busname
+
 polkitpolicy_files += \
 	src/timedate/org.freedesktop.timedate1.policy
 
@@ -3735,6 +3887,9 @@ INSTALL_DIRS += \
 SYSTEM_UNIT_ALIASES += \
 	systemd-timedated.service dbus-org.freedesktop.timedate1.service
 
+BUSNAMES_TARGET_WANTS += \
+	org.freedesktop.timedate1.busname
+
 timedatectl_SOURCES = \
 	src/timedate/timedatectl.c
 
@@ -3779,6 +3934,48 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
+# ------------------------------------------------------------------------------
+libsystemd_dhcp_la_SOURCES = \
+	src/systemd/sd-dhcp-client.h \
+	src/libsystemd-dhcp/dhcp-protocol.h \
+	src/libsystemd-dhcp/dhcp-internal.h \
+	src/libsystemd-dhcp/dhcp-network.c \
+	src/libsystemd-dhcp/dhcp-option.c \
+	src/libsystemd-dhcp/dhcp-client.c
+
+noinst_LTLIBRARIES += \
+	libsystemd-dhcp.la
+
+libsystemd_dhcp_la_LIBADD = \
+	libsystemd-bus-internal.la \
+	libsystemd-shared.la
+
+test_dhcp_option_SOURCES = \
+	src/libsystemd-dhcp/dhcp-protocol.h \
+	src/libsystemd-dhcp/dhcp-internal.h \
+	src/libsystemd-dhcp/test-dhcp-option.c
+
+test_dhcp_option_LDADD = \
+	libsystemd-dhcp.la \
+	libsystemd-shared.la
+
+test_dhcp_client_SOURCES = \
+	src/libsystemd-dhcp/dhcp-protocol.h \
+	src/systemd/sd-dhcp-client.h \
+	src/libsystemd-dhcp/dhcp-internal.h \
+	src/libsystemd-dhcp/test-dhcp-client.c
+
+test_dhcp_client_LDADD = \
+	libsystemd-bus-internal.la \
+	libsystemd-daemon-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-dhcp.la \
+	libsystemd-shared.la
+
+tests += \
+	test-dhcp-option \
+	test-dhcp-client
+
 # ------------------------------------------------------------------------------
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
@@ -3833,7 +4030,8 @@ nodist_systemunit_DATA += \
 	units/systemd-machined.service
 
 dist_systemunit_DATA += \
-	units/machine.slice
+	units/machine.slice \
+	units/org.freedesktop.machine1.busname
 
 dist_dbussystemservice_DATA += \
 	src/machine/org.freedesktop.machine1.service
@@ -3847,6 +4045,9 @@ dist_zshcompletion_DATA += \
 SYSTEM_UNIT_ALIASES += \
 	systemd-machined.service dbus-org.freedesktop.machine1.service
 
+BUSNAMES_TARGET_WANTS += \
+	org.freedesktop.machine1.busname
+
 EXTRA_DIST += \
 	units/systemd-machined.service.in
 
@@ -3876,6 +4077,7 @@ systemd_networkd_LDADD = \
 	libsystemd-bus-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-rtnl.la \
+	libsystemd-dhcp.la \
 	libsystemd-shared.la
 
 nodist_systemunit_DATA += \
@@ -3899,10 +4101,13 @@ test_network_LDADD = \
 	libudev-internal.la \
 	libsystemd-bus-internal.la \
 	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
 	libsystemd-rtnl.la \
+	libsystemd-dhcp.la \
 	libsystemd-shared.la
 
-tests += test-network
+tests += \
+	test-network
 
 EXTRA_DIST += \
 	src/network/networkd-gperf.gperf \
@@ -4120,7 +4325,8 @@ nodist_systemunit_DATA += \
 	units/systemd-user-sessions.service
 
 dist_systemunit_DATA += \
-	units/user.slice
+	units/user.slice \
+	units/org.freedesktop.login1.busname
 
 dist_dbussystemservice_DATA += \
 	src/login/org.freedesktop.login1.service
@@ -4156,6 +4362,9 @@ MULTI_USER_TARGET_WANTS += \
 SYSTEM_UNIT_ALIASES += \
 	systemd-logind.service dbus-org.freedesktop.login1.service
 
+BUSNAMES_TARGET_WANTS += \
+	org.freedesktop.login1.busname
+
 if ENABLE_MULTI_SEAT_X
 
 systemd_multi_seat_x_SOURCES = \
@@ -4438,11 +4647,11 @@ src/%: src/%.m4
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
 units/%: units/%.m4
-	$(AM_V_M4)$(MKDIR_P) $(dir $@)
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 units/user/%: units/%.m4
-	$(AM_V_M4)$(MKDIR_P) $(dir $@)
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 if ENABLE_POLKIT
@@ -4591,6 +4800,7 @@ SYSTEM_UNIT_ALIASES += \
 USER_UNIT_ALIASES += \
 	$(systemunitdir)/shutdown.target shutdown.target \
 	$(systemunitdir)/sockets.target sockets.target \
+	$(systemunitdir)/busnames.target busnames.target \
 	$(systemunitdir)/timers.target timers.target \
 	$(systemunitdir)/paths.target paths.target \
 	$(systemunitdir)/bluetooth.target bluetooth.target \
@@ -4657,7 +4867,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
 	--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
 	--with-rootprefix=$$dc_install_base \
-	--disable-split-usr
+	--disable-split-usr \
+	--enable-kdbus
 
 if HAVE_SYSV_COMPAT
 DISTCHECK_CONFIGURE_FLAGS += \
@@ -4712,8 +4923,11 @@ install-tree: all
 # exclude the one perl script we have in there
 valgrind-tests: $(TESTS)
 	$(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 ; \
+		if file $$f | grep -q shell; then \
+		echo -e "$${x}Skipping non-binary $$f"; else \
+		echo -e "$${x}Running $$f"; \
+	        libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; fi; \
+		x="\n\n"; \
 	done
 
 exported-%: %
@@ -4835,3 +5049,6 @@ tests += \
 	test-libsystemd-journal-sym \
 	test-libsystemd-login-sym \
 	test-libudev-sym
+
+cppcheck:
+	cppcheck --enable=all -q $(top_srcdir)