X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=ce5ff6392d479fe8828bac72e8867c1b9b5ffd6f;hp=76d1eeb3935474c9127ee8e1d7639fd8da92fd22;hb=faaa5728d956b7f0d24f27f3341d0b9fff30af00;hpb=9cada1952a371e1b74b5e4bcae020ca1e88fdec8

diff --git a/Makefile.am b/Makefile.am
index 76d1eeb39..ce5ff6392 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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,18 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=3
 LIBSYSTEMD_JOURNAL_AGE=11
 
+LIBSYSTEMD_BUS_CURRENT=0
+LIBSYSTEMD_BUS_REVISION=0
+LIBSYSTEMD_BUS_AGE=0
+
+LIBSYSTEMD_EVENT_CURRENT=0
+LIBSYSTEMD_EVENT_REVISION=0
+LIBSYSTEMD_EVENT_AGE=0
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
-dbusinterfacedir=@dbusinterfacedir@
 pamlibdir=@pamlibdir@
 pamconfdir=@pamconfdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
@@ -83,6 +91,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 +135,6 @@ nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
 dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
-dbusinterface_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
@@ -180,8 +188,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 +329,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 +352,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 +426,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 +469,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 +500,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 +632,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-shared.la \
+	libsystemd-rtnl.la
+
+tests += test-rtnl
+
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-shared.la
@@ -732,7 +756,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 += \
@@ -740,11 +768,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) \
@@ -804,9 +828,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 \
@@ -1079,29 +1100,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 +1141,7 @@ tests += \
 	test-utf8 \
 	test-ellipsize \
 	test-util \
+	test-namespace \
 	test-date \
 	test-sleep \
 	test-replace-var \
@@ -1251,36 +1253,30 @@ test_unit_file_LDADD = \
 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
 
@@ -1299,27 +1295,18 @@ test_tables_LDADD = \
 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
 
@@ -1488,18 +1475,26 @@ lcov-run lcov-report:
 	echo "Need to reconfigure with --enable-coverage"
 endif
 
+# ------------------------------------------------------------------------------
+systemd_analyze_SOURCES = \
+	src/analyze/analyze.c
+
+systemd_analyze_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon.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 +1502,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)
 
 # ------------------------------------------------------------------------------
@@ -1660,13 +1656,11 @@ systemd_sleep_LDADD = \
 systemd_fsck_SOURCES = \
 	src/fsck/fsck.c
 
-systemd_fsck_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_fsck_LDADD = \
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
 	libsystemd-shared.la \
-	libsystemd-dbus.la \
 	libudev.la
 
 # ------------------------------------------------------------------------------
@@ -1793,13 +1787,11 @@ 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 = \
@@ -1866,10 +1858,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-shared.la \
+	libsystemd-daemon.la
 
 # ------------------------------------------------------------------------------
 systemd_run_SOURCES = \
@@ -1878,10 +1870,10 @@ systemd_run_SOURCES = \
 systemd_run_LDADD = \
 	libsystemd-label.la \
 	libsystemd-capability.la \
+	libsystemd-bus-internal.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-id128-internal.la \
-	libsystemd-bus.la
+	libsystemd-id128-internal.la
 
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
@@ -1947,12 +1939,32 @@ EXTRA_DIST += \
 	src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
+libsystemd_event_la_SOURCES = \
+	src/libsystemd-bus/sd-event.c \
+	src/systemd/sd-event.h \
+	src/libsystemd-bus/event-util.h
+
+libsystemd_event_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-version-info $(LIBSYSTEMD_EVENT_CURRENT):$(LIBSYSTEMD_EVENT_REVISION):$(LIBSYSTEMD_EVENT_AGE) \
+	-Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-event.sym
+
+EXTRA_DIST += \
+	src/libsystemd-bus/libsystemd-event.sym
+
+lib_LTLIBRARIES += \
+	libsystemd-event.la
+
+libsystemd_event_la_LIBADD =  \
+	libsystemd-id128-internal.la \
+	libsystemd-shared.la
+
 libsystemd_bus_la_SOURCES = \
 	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-event.h \
+	src/systemd/sd-utf8.h \
 	src/libsystemd-bus/sd-bus.c \
 	src/libsystemd-bus/bus-control.c \
 	src/libsystemd-bus/bus-control.h \
@@ -1964,6 +1976,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 +1995,41 @@ 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
 
 libsystemd_bus_la_LIBADD =  \
 	libsystemd-id128-internal.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la
+	libsystemd-daemon.la \
+	libsystemd-event.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
+
+EXTRA_DIST += \
+	src/libsystemd-bus/libsystemd-bus.sym
+
+lib_LTLIBRARIES += \
 	libsystemd-bus.la
 
+libsystemd_bus_internal_la_SOURCES = \
+	$(libsystemd_bus_la_SOURCES) \
+	$(libsystemd_event_la_SOURCES)
+
+libsystemd_bus_internal_la_CFLAGS = \
+	$(libsystemd_bus_la_CFLAGS)
+
+noinst_LTLIBRARIES += \
+	libsystemd-bus-internal.la
+
 tests += \
 	test-bus-marshal \
 	test-bus-signature \
@@ -2017,8 +2052,10 @@ test_bus_marshal_SOURCES = \
 	src/libsystemd-bus/test-bus-marshal.c
 
 test_bus_marshal_LDADD = \
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
 	libsystemd-shared.la \
-	libsystemd-bus.la \
+	libsystemd-daemon.la \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS)
 
@@ -2032,7 +2069,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
@@ -2042,9 +2079,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,9 +2092,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
@@ -2066,98 +2105,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
 
 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
@@ -2252,10 +2280,14 @@ 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 \
@@ -2266,7 +2298,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 = \
@@ -2347,19 +2379,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) \
@@ -2371,6 +2413,8 @@ libudev_core_la_LIBADD = \
 	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
 	libsystemd-shared.la \
+	libsystemd-rtnl.la \
+	libsystemd-id128-internal.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
 
@@ -2669,13 +2713,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
 
@@ -2758,9 +2803,7 @@ libsystemd_id128_la_LDFLAGS = \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
-	libsystemd-shared.la \
-	libsystemd-daemon-internal.la \
-	$(RT_LIBS)
+	libsystemd-shared.la
 
 libsystemd_id128_internal_la_SOURCES = \
 	$(libsystemd_id128_la_SOURCES)
@@ -2811,6 +2854,7 @@ systemd_activate_SOURCES = \
 	src/activate/activate.c
 
 systemd_activate_LDADD = \
+	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la
 
@@ -2831,12 +2875,13 @@ systemd_cat_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-journal-internal.la
 
-journalctl_SOURCES = \
-	src/journal/journalctl.c
-
+# 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 \
@@ -2956,6 +3001,7 @@ test_catalog_LDADD = \
 libsystemd_journal_la_SOURCES = \
 	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 \
@@ -3006,6 +3052,7 @@ libsystemd_journal_internal_la_SOURCES = \
 	src/journal/journald-rate-limit.h \
 	src/journal/journal-internal.h
 
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 libsystemd_journal_internal_la_CFLAGS = \
 	$(AM_CFLAGS)
 
@@ -3119,7 +3166,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
@@ -3190,8 +3238,8 @@ systemd_journal_gatewayd_LDADD = \
 	$(MICROHTTPD_LIBS)
 
 systemd_journal_gatewayd_CFLAGS = \
-	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
 	$(AM_CFLAGS) \
+	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
 	$(MICROHTTPD_CFLAGS)
 
 dist_systemunit_DATA += \
@@ -3208,6 +3256,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-event.la \
+	libsystemd-journal-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-shared.la \
+	libsystemd-daemon.la
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -3490,15 +3551,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
@@ -3515,28 +3573,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
@@ -3560,15 +3607,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
@@ -3585,14 +3629,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
 
@@ -3608,14 +3644,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
@@ -3639,15 +3672,13 @@ if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
 	src/timedate/timedated.c
 
-systemd_timedated_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_timedated_LDADD = \
 	libsystemd-label.la \
+	libsystemd-bus-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon-internal.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la \
-	libsystemd-dbus.la
+	libsystemd-bus.la
 
 rootlibexec_PROGRAMS += \
 	systemd-timedated
@@ -3664,14 +3695,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
@@ -3682,13 +3705,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
@@ -3713,9 +3734,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 \
@@ -3734,9 +3752,6 @@ 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)
@@ -3750,16 +3765,12 @@ 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-bus-internal.la \
 	libsystemd-id128-internal.la \
 	libudev.la
 
@@ -3769,14 +3780,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
@@ -3784,10 +3792,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
 
@@ -3826,9 +3830,6 @@ 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)
@@ -3859,17 +3860,13 @@ 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-audit.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-dbus.la \
 	libsystemd-id128-internal.la \
+	libsystemd-bus-internal.la \
 	libudev.la
 
 if HAVE_ACL
@@ -3919,13 +3916,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
@@ -3949,19 +3944,11 @@ test_inhibit_SOURCES = \
 
 test_inhibit_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-dbus.la
-
-test_inhibit_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
+	libsystemd-bus.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
 
@@ -4003,7 +3990,6 @@ pam_systemd_la_SOURCES = \
 pam_systemd_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(PAM_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	-fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -4016,9 +4002,9 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
 	libsystemd-audit.la \
-	libsystemd-dbus.la \
+	libsystemd-bus.la \
 	libsystemd-shared.la \
-	libsystemd-daemon-internal.la \
+	libsystemd-daemon.la \
 	$(RT_LIBS) \
 	$(PAM_LIBS)
 
@@ -4439,11 +4425,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
@@ -4486,7 +4467,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 \
@@ -4544,6 +4524,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 \
@@ -4578,7 +4560,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) \