Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts:
#	src/libsystemd/libsystemd-internal/Makefile

20 files changed, 327 insertions, 250 deletions

diff --git a/Makefile.am b/Makefile.am
index f1d83b1e99..39d6503d7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1428,7 +1428,7 @@ src/resolve/dns_type-from-name.gperf: src/resolve/dns_type-list.txt
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@
 
-#@src/system/systemd/Makefile --------------------------------------------------
+#@src/grp-system/systemd/Makefile ----------------------------------------------
 systemd_SOURCES = \
 	src/core/main.c
 
@@ -2663,7 +2663,7 @@ EXTRA_DIST += \
 	units/systemd-hibernate-resume@.service.in \
 	units/systemd-hybrid-sleep.service.in
 
-#@src/boot/Makefile ------------------------------------------------------------
+#@src/grp-boot/bootctl/Makefile ------------------------------------------------
 if ENABLE_EFI
 if HAVE_BLKID
 bootctl_SOURCES = \
@@ -2692,7 +2692,7 @@ dist_zshcompletion_data += \
 	shell-completion/zsh/_bootctl
 endif
 
-#@discard.mk -------------------------------------------------------------------
+#@src/grp-boot/systemd-boot/Makefile -------------------------------------------
 if HAVE_GNUEFI
 efi_cppflags = \
 	$(EFI_CPPFLAGS) \
@@ -2753,7 +2753,7 @@ endif
 endif
 endif
 
-#@src/boot/efi/Makefile --------------------------------------------------------
+# ------------------------------------------------------------------------------
 systemd_boot_headers = \
 	src/boot/efi/util.h \
 	src/boot/efi/console.h \
@@ -2935,7 +2935,7 @@ systemd_escape_SOURCES = \
 systemd_escape_LDADD = \
 	libshared.la
 
-#@src/system/systemctl/Makefile ------------------------------------------------
+#@src/grp-system/systemctl/Makefile --------------------------------------------
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
@@ -3035,7 +3035,7 @@ systemd_run_SOURCES = \
 systemd_run_LDADD = \
 	libshared.la
 
-#@src/bus-proxyd/Makefile ------------------------------------------------------
+#@src/libbus-proxy-core/Makefile -----------------------------------------------
 noinst_LTLIBRARIES += \
 	libbus-proxy-core.la
 
@@ -3052,6 +3052,7 @@ libbus_proxy_core_la_SOURCES = \
 libbus_proxy_core_la_LIBADD = \
 	libshared.la
 
+#@src/systemd-bus-proxyd/Makefile
 systemd_bus_proxyd_SOURCES = \
 	src/bus-proxyd/bus-proxyd.c
 
@@ -3059,6 +3060,7 @@ systemd_bus_proxyd_LDADD = \
 	libbus-proxy-core.la \
 	libshared.la
 
+#@src/systemd-stdio-bridge/Makefile
 systemd_stdio_bridge_SOURCES = \
 	src/bus-proxyd/stdio-bridge.c
 
@@ -3066,6 +3068,7 @@ systemd_stdio_bridge_LDADD = \
 	libbus-proxy-core.la \
 	libshared.la
 
+#@src/systemd-bus-proxyd/Makefile
 nodist_systemunit_DATA += \
 	units/systemd-bus-proxyd.service
 
@@ -3274,6 +3277,7 @@ tests += \
 bin_PROGRAMS += \
 	busctl
 
+#@src/libsystemd/libsystemd-internal/Makefile
 test_bus_marshal_SOURCES = \
 	src/libsystemd/sd-bus/test-bus-marshal.c
 
@@ -3410,6 +3414,7 @@ test_resolve_SOURCES = \
 test_resolve_LDADD = \
 	libshared.la
 
+#@src/busctl/Makefile
 busctl_SOURCES = \
 	src/libsystemd/sd-bus/busctl.c \
 	src/libsystemd/sd-bus/busctl-introspect.c \
@@ -4466,7 +4471,7 @@ systemd_socket_proxyd_SOURCES = \
 systemd_socket_proxyd_LDADD = \
 	libshared.la
 
-#@src/systemd-coredump/Makefile ------------------------------------------------
+#@src/grp-coredump/systemd-coredump/Makefile -----------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
 	src/coredump/coredump.c \
@@ -4500,7 +4505,7 @@ rootlibexec_PROGRAMS += \
 dist_pkgsysconf_DATA += \
 	src/coredump/coredump.conf
 
-#@src/coredumpctl/Makefile
+#@src/grp-coredump/coredumpctl/Makefile
 coredumpctl_SOURCES = \
 	src/coredump/coredumpctl.c
 
@@ -4510,7 +4515,7 @@ coredumpctl_LDADD = \
 bin_PROGRAMS += \
 	coredumpctl
 
-#@src/systemd-coredump/Makefile
+#@src/grp-coredump/systemd-coredump/Makefile
 manual_tests += \
 	test-coredump-vacuum
 
@@ -4522,14 +4527,14 @@ test_coredump_vacuum_SOURCES = \
 test_coredump_vacuum_LDADD = \
 	libshared.la
 
-#@src/coredumpctl/Makefile
+#@src/grp-coredump/coredumpctl/Makefile
 dist_bashcompletion_data += \
 	shell-completion/bash/coredumpctl
 
 dist_zshcompletion_data += \
 	shell-completion/zsh/_coredumpctl
 
-#@src/systemd-coredump/Makefile
+#@src/grp-coredump/systemd-coredump/Makefile
 nodist_sysctl_DATA = \
 	sysctl.d/50-coredump.conf
 
@@ -4793,7 +4798,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-hostnamed.service.in
 
-#@src/system/systemd/Makefile --------------------------------------------------
+#@src/grp-system/systemd/Makefile ----------------------------------------------
 dist_systemunit_DATA_busnames += \
 	units/org.freedesktop.systemd1.busname
 
@@ -4980,7 +4985,7 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
-#@src/machine/src/Makefile -----------------------------------------------------
+#@src/grp-machine/systemd-machined/Makefile ------------------------------------
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
 	src/machine/machined.c \
@@ -5252,7 +5257,7 @@ EXTRA_DIST += \
 	units/systemd-importd.service.in
 
 
-#@src/resolve/src/Makefile -----------------------------------------------------
+#@src/grp-resolve/systemd-resolved/Makefile ------------------------------------
 if ENABLE_RESOLVED
 
 systemd_resolved_SOURCES = \
diff --git a/discard.mk b/discard.mk
index 2d2cbfc198..3d3eadb1c9 100644
--- a/discard.mk
+++ b/discard.mk
@@ -715,66 +715,6 @@ dist_factory_pam_DATA = \
 	factory/etc/pam.d/other
 endif
 
-ifneq ($(HAVE_GNUEFI),)
-efi_cppflags = \
-	$(EFI_CPPFLAGS) \
-	-I$(top_builddir) -include config.h \
-	-I$(EFI_INC_DIR)/efi \
-	-I$(EFI_INC_DIR)/efi/$(EFI_ARCH) \
-	-DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\"
-
-efi_cflags = \
-	$(EFI_CFLAGS) \
-	-Wall \
-	-Wextra \
-	-std=gnu90 \
-	-nostdinc \
-	-ggdb -O0 \
-	-fpic \
-	-fshort-wchar \
-	-nostdinc \
-	-ffreestanding \
-	-fno-strict-aliasing \
-	-fno-stack-protector \
-	-Wsign-compare \
-	-Wno-missing-field-initializers
-
-ifneq ($(ARCH_X86_64),)
-efi_cflags += \
-	-mno-red-zone \
-	-mno-sse \
-	-mno-mmx \
-	-DEFI_FUNCTION_WRAPPER \
-	-DGNU_EFI_USE_MS_ABI
-endif
-
-ifneq ($(ARCH_IA32),)
-efi_cflags += \
-	-mno-sse \
-	-mno-mmx
-endif
-
-efi_ldflags = \
-	$(EFI_LDFLAGS) \
-	-T $(EFI_LDS_DIR)/elf_$(EFI_ARCH)_efi.lds \
-	-shared \
-	-Bsymbolic \
-	-nostdlib \
-	-znocombreloc \
-	-L $(EFI_LIB_DIR) \
-	$(EFI_LDS_DIR)/crt0-efi-$(EFI_ARCH).o
-
-# Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' instead,
-# and add required symbols manually.
-ifneq ($(ARCH_AARCH64),)
-efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
-EFI_FORMAT = -O binary
-else
-EFI_FORMAT = --target=efi-app-$(EFI_ARCH)
-endif
-endif
-endif
-
 libsystemd-install-hook:
 	libname=libsystemd.so && $(move-to-libdir)
 
diff --git a/move.sh b/move.sh
index 7fc3c6ebcb..2ec0723073 100755
--- a/move.sh
+++ b/move.sh
@@ -10,7 +10,7 @@ in_array() {
 }
 
 move_files() (
-	for d in libsystemd libudev machine resolve; do
+	for d in libsystemd libudev; do
 		mkdir src/$d-new
 		mv -T src/$d src/$d-new/src
 		mv -T src/$d-new src/$d
@@ -84,26 +84,31 @@ move_files() (
 	mkdir src/libsystemd/include
 	mv -T src/{,libsystemd/include}/systemd
 
-	mv -T src/{,machine}/nss-mymachines
-	mv -T src/{,resolve}/nss-resolve
+	mkdir src/grp-machine
+	mv -T src/{machine,grp-machine/systemd-machined}
+	mv -T src/{,grp-machine}/nss-mymachines
 
-	mkdir src/system
-	mv -T src/{,system}/systemctl
+	mkdir src/grp-resolve
+	mv -T src/{resolve,grp-resolve/systemd-resolved}
+	mv -T src/{,grp-resolve}/nss-resolve
+
+	mkdir src/grp-system
+	mv -T src/{,grp-system}/systemctl
 
 	mkdir src/libfirewall
 	mv -T src/lib{shared,firewall}/firewall-util.c
 	mv -T src/lib{shared,firewall}/firewall-util.h
 
-	mkdir src/system/systemd
-	mv -T src/{libcore,system/systemd}/main.c
-	mv -T src/{libcore,system/systemd}/macros.systemd.in
-	mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.conf
-	mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.policy.in.in
-	mv -T src/{libcore,system/systemd}/org.freedesktop.systemd1.service
-	mv -T src/{libcore,system/systemd}/system.conf
-	mv -T src/{libcore,system/systemd}/systemd.pc.in
-	mv -T src/{libcore,system/systemd}/triggers.systemd.in
-	mv -T src/{libcore,system/systemd}/user.conf
+	mkdir src/grp-system/systemd
+	mv -T src/{libcore,grp-system/systemd}/main.c
+	mv -T src/{libcore,grp-system/systemd}/macros.systemd.in
+	mv -T src/{libcore,grp-system/systemd}/org.freedesktop.systemd1.conf
+	mv -T src/{libcore,grp-system/systemd}/org.freedesktop.systemd1.policy.in.in
+	mv -T src/{libcore,grp-system/systemd}/org.freedesktop.systemd1.service
+	mv -T src/{libcore,grp-system/systemd}/system.conf
+	mv -T src/{libcore,grp-system/systemd}/systemd.pc.in
+	mv -T src/{libcore,grp-system/systemd}/triggers.systemd.in
+	mv -T src/{libcore,grp-system/systemd}/user.conf
 
 	mkdir src/libudev/include
 	mv -T src/libudev/{src,include}/libudev.h
@@ -117,8 +122,14 @@ move_files() (
 
 	mkdir src/systemd-shutdown
 
-	mkdir src/coredumpctl
-	mv -T src/{systemd-coredump,coredumpctl}/coredumpctl.c
+	mkdir src/grp-coredump
+	mv -T src/{,grp-coredump}/systemd-coredump
+	mkdir src/grp-coredump/coredumpctl
+	mv -T src/grp-coredump/{systemd-coredump,coredumpctl}/coredumpctl.c
+
+	mkdir src/grp-boot
+	mv -T src/boot/efi src/grp-boot/systemd-boot
+	mv -T src/boot src/grp-boot/bootctl
 
 	mkdir build-aux
 	mkdir build-aux/Makefile.{once,each}.{head,tail}
@@ -160,6 +171,12 @@ move_files() (
 	mv src/libsystemd/libsystemd-internal/sd-bus/busctl* src/busctl
 
 	mv -T src/{udev,libudev/src}/udev.h
+
+	mv -T src/{bus-proxyd,libbus-proxy-core}
+	mkdir src/systemd-bus-proxyd
+	mv  src/{libbus-proxy-core,systemd-bus-proxyd}/bus-proxyd.c
+	mkdir src/systemd-stdio-bridge
+	mv  src/{libbus-proxy-core,systemd-stdio-bridge}/stdio-bridge.c
 )
 
 breakup_makefile() (
diff --git a/src/busctl/Makefile b/src/busctl/Makefile
index d7221f9dcd..261486555d 100644
--- a/src/busctl/Makefile
+++ b/src/busctl/Makefile
@@ -26,142 +26,6 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 bin_PROGRAMS += \
 	busctl
 
-test_bus_marshal_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-marshal.c
-
-test_bus_marshal_LDADD = \
-	libshared.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-test_bus_marshal_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-test_bus_signature_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-signature.c
-
-test_bus_signature_LDADD = \
-	libshared.la
-
-test_bus_chat_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-chat.c
-
-test_bus_chat_LDADD = \
-	libshared.la
-
-test_bus_cleanup_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-cleanup.c
-
-test_bus_cleanup_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(SECCOMP_CFLAGS)
-
-test_bus_cleanup_LDADD = \
-	libshared.la
-
-test_bus_server_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-server.c
-
-test_bus_server_LDADD = \
-	libshared.la
-
-test_bus_objects_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-objects.c
-
-test_bus_objects_LDADD = \
-	libshared.la
-
-test_bus_error_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-error.c
-
-test_bus_error_LDADD = \
-	libshared.la
-
-test_bus_gvariant_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-gvariant.c
-
-test_bus_gvariant_LDADD = \
-	libshared.la \
-	$(GLIB_LIBS)
-
-test_bus_gvariant_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GLIB_CFLAGS)
-
-test_bus_creds_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-creds.c
-
-test_bus_creds_LDADD = \
-	libshared.la
-
-test_bus_match_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-match.c
-
-test_bus_match_LDADD = \
-	libshared.la
-
-test_bus_proxy_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-proxy.c
-
-test_bus_proxy_LDADD = \
-	libshared.la
-
-test_bus_kernel_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-kernel.c
-
-test_bus_kernel_LDADD = \
-	libshared.la
-
-test_bus_kernel_bloom_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-kernel-bloom.c
-
-test_bus_kernel_bloom_LDADD = \
-	libshared.la
-
-test_bus_benchmark_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-benchmark.c
-
-test_bus_benchmark_LDADD = \
-	libshared.la
-
-test_bus_zero_copy_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-zero-copy.c
-
-test_bus_zero_copy_LDADD = \
-	libshared.la
-
-test_bus_introspect_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-introspect.c
-
-test_bus_introspect_LDADD = \
-	libshared.la
-
-test_event_SOURCES = \
-	src/libsystemd/sd-event/test-event.c
-
-test_event_LDADD = \
-	libshared.la
-
-test_netlink_SOURCES = \
-	src/libsystemd/sd-netlink/test-netlink.c
-
-test_netlink_LDADD = \
-	libshared.la
-
-test_local_addresses_SOURCES = \
-	src/libsystemd/sd-netlink/test-local-addresses.c
-
-test_local_addresses_LDADD = \
-	libshared.la
-
-test_resolve_SOURCES = \
-	src/libsystemd/sd-resolve/test-resolve.c
-
-test_resolve_LDADD = \
-	libshared.la
-
 busctl_SOURCES = \
 	src/libsystemd/sd-bus/busctl.c \
 	src/libsystemd/sd-bus/busctl-introspect.c \
diff --git a/src/grp-boot/systemd-boot/Makefile b/src/grp-boot/systemd-boot/Makefile
index 182a272054..afa32f02fd 100644
--- a/src/grp-boot/systemd-boot/Makefile
+++ b/src/grp-boot/systemd-boot/Makefile
@@ -23,6 +23,67 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+ifneq ($(HAVE_GNUEFI),)
+efi_cppflags = \
+	$(EFI_CPPFLAGS) \
+	-I$(top_builddir) -include config.h \
+	-I$(EFI_INC_DIR)/efi \
+	-I$(EFI_INC_DIR)/efi/$(EFI_ARCH) \
+	-DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\"
+
+efi_cflags = \
+	$(EFI_CFLAGS) \
+	-Wall \
+	-Wextra \
+	-std=gnu90 \
+	-nostdinc \
+	-ggdb -O0 \
+	-fpic \
+	-fshort-wchar \
+	-nostdinc \
+	-ffreestanding \
+	-fno-strict-aliasing \
+	-fno-stack-protector \
+	-Wsign-compare \
+	-Wno-missing-field-initializers
+
+ifneq ($(ARCH_X86_64),)
+efi_cflags += \
+	-mno-red-zone \
+	-mno-sse \
+	-mno-mmx \
+	-DEFI_FUNCTION_WRAPPER \
+	-DGNU_EFI_USE_MS_ABI
+endif
+
+ifneq ($(ARCH_IA32),)
+efi_cflags += \
+	-mno-sse \
+	-mno-mmx
+endif
+
+efi_ldflags = \
+	$(EFI_LDFLAGS) \
+	-T $(EFI_LDS_DIR)/elf_$(EFI_ARCH)_efi.lds \
+	-shared \
+	-Bsymbolic \
+	-nostdlib \
+	-znocombreloc \
+	-L $(EFI_LIB_DIR) \
+	$(EFI_LDS_DIR)/crt0-efi-$(EFI_ARCH).o
+
+# Aarch64 and ARM32 don't have an EFI capable objcopy. Use 'binary' instead,
+# and add required symbols manually.
+ifneq ($(ARCH_AARCH64),)
+efi_ldflags += --defsym=EFI_SUBSYSTEM=0xa
+EFI_FORMAT = -O binary
+else
+EFI_FORMAT = --target=efi-app-$(EFI_ARCH)
+endif
+endif
+endif
+
+# ------------------------------------------------------------------------------
 systemd_boot_headers = \
 	src/boot/efi/util.h \
 	src/boot/efi/console.h \
diff --git a/src/libbus-proxy-core/Makefile b/src/libbus-proxy-core/Makefile
new file mode 100644
index 0000000000..3ac995f31c
--- /dev/null
+++ b/src/libbus-proxy-core/Makefile
@@ -0,0 +1,43 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  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
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+noinst_LTLIBRARIES += \
+	libbus-proxy-core.la
+
+libbus_proxy_core_la_SOURCES = \
+	src/bus-proxyd/bus-xml-policy.c \
+	src/bus-proxyd/bus-xml-policy.h \
+	src/bus-proxyd/driver.c \
+	src/bus-proxyd/driver.h \
+	src/bus-proxyd/proxy.c \
+	src/bus-proxyd/proxy.h \
+	src/bus-proxyd/synthesize.c \
+	src/bus-proxyd/synthesize.h
+
+libbus_proxy_core_la_LIBADD = \
+	libshared.la
+
+$(eval $(value automake2autothing))
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/bus-proxyd/bus-xml-policy.c b/src/libbus-proxy-core/bus-xml-policy.c
index 86a8362142..86a8362142 100644
--- a/src/bus-proxyd/bus-xml-policy.c
+++ b/src/libbus-proxy-core/bus-xml-policy.c
diff --git a/src/bus-proxyd/bus-xml-policy.h b/src/libbus-proxy-core/bus-xml-policy.h
index 3dcddaa048..3dcddaa048 100644
--- a/src/bus-proxyd/bus-xml-policy.h
+++ b/src/libbus-proxy-core/bus-xml-policy.h
diff --git a/src/bus-proxyd/driver.c b/src/libbus-proxy-core/driver.c
index 133b2e0f39..133b2e0f39 100644
--- a/src/bus-proxyd/driver.c
+++ b/src/libbus-proxy-core/driver.c
diff --git a/src/bus-proxyd/driver.h b/src/libbus-proxy-core/driver.h
index cad7aa7851..cad7aa7851 100644
--- a/src/bus-proxyd/driver.h
+++ b/src/libbus-proxy-core/driver.h
diff --git a/src/bus-proxyd/proxy.c b/src/libbus-proxy-core/proxy.c
index bcfbab0dad..bcfbab0dad 100644
--- a/src/bus-proxyd/proxy.c
+++ b/src/libbus-proxy-core/proxy.c
diff --git a/src/bus-proxyd/proxy.h b/src/libbus-proxy-core/proxy.h
index 0e3ed8a87a..0e3ed8a87a 100644
--- a/src/bus-proxyd/proxy.h
+++ b/src/libbus-proxy-core/proxy.h
diff --git a/src/bus-proxyd/synthesize.c b/src/libbus-proxy-core/synthesize.c
index 7562f29ecb..7562f29ecb 100644
--- a/src/bus-proxyd/synthesize.c
+++ b/src/libbus-proxy-core/synthesize.c
diff --git a/src/bus-proxyd/synthesize.h b/src/libbus-proxy-core/synthesize.h
index cb8c21cdb7..cb8c21cdb7 100644
--- a/src/bus-proxyd/synthesize.h
+++ b/src/libbus-proxy-core/synthesize.h
diff --git a/src/bus-proxyd/test-bus-xml-policy.c b/src/libbus-proxy-core/test-bus-xml-policy.c
index 6f32c09789..6f32c09789 100644
--- a/src/bus-proxyd/test-bus-xml-policy.c
+++ b/src/libbus-proxy-core/test-bus-xml-policy.c
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
index 5bb37fcd4b..4bd6b8c355 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -120,6 +120,142 @@ libsystemd_internal_la_LIBADD = \
 noinst_LTLIBRARIES += \
 	libsystemd-internal.la
 
+test_bus_marshal_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-marshal.c
+
+test_bus_marshal_LDADD = \
+	libshared.la \
+	$(GLIB_LIBS) \
+	$(DBUS_LIBS)
+
+test_bus_marshal_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+test_bus_signature_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-signature.c
+
+test_bus_signature_LDADD = \
+	libshared.la
+
+test_bus_chat_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-chat.c
+
+test_bus_chat_LDADD = \
+	libshared.la
+
+test_bus_cleanup_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-cleanup.c
+
+test_bus_cleanup_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(SECCOMP_CFLAGS)
+
+test_bus_cleanup_LDADD = \
+	libshared.la
+
+test_bus_server_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-server.c
+
+test_bus_server_LDADD = \
+	libshared.la
+
+test_bus_objects_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-objects.c
+
+test_bus_objects_LDADD = \
+	libshared.la
+
+test_bus_error_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-error.c
+
+test_bus_error_LDADD = \
+	libshared.la
+
+test_bus_gvariant_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-gvariant.c
+
+test_bus_gvariant_LDADD = \
+	libshared.la \
+	$(GLIB_LIBS)
+
+test_bus_gvariant_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(GLIB_CFLAGS)
+
+test_bus_creds_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-creds.c
+
+test_bus_creds_LDADD = \
+	libshared.la
+
+test_bus_match_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-match.c
+
+test_bus_match_LDADD = \
+	libshared.la
+
+test_bus_proxy_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-proxy.c
+
+test_bus_proxy_LDADD = \
+	libshared.la
+
+test_bus_kernel_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-kernel.c
+
+test_bus_kernel_LDADD = \
+	libshared.la
+
+test_bus_kernel_bloom_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-kernel-bloom.c
+
+test_bus_kernel_bloom_LDADD = \
+	libshared.la
+
+test_bus_benchmark_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-benchmark.c
+
+test_bus_benchmark_LDADD = \
+	libshared.la
+
+test_bus_zero_copy_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-zero-copy.c
+
+test_bus_zero_copy_LDADD = \
+	libshared.la
+
+test_bus_introspect_SOURCES = \
+	src/libsystemd/sd-bus/test-bus-introspect.c
+
+test_bus_introspect_LDADD = \
+	libshared.la
+
+test_event_SOURCES = \
+	src/libsystemd/sd-event/test-event.c
+
+test_event_LDADD = \
+	libshared.la
+
+test_netlink_SOURCES = \
+	src/libsystemd/sd-netlink/test-netlink.c
+
+test_netlink_LDADD = \
+	libshared.la
+
+test_local_addresses_SOURCES = \
+	src/libsystemd/sd-netlink/test-local-addresses.c
+
+test_local_addresses_LDADD = \
+	libshared.la
+
+test_resolve_SOURCES = \
+	src/libsystemd/sd-resolve/test-resolve.c
+
+test_resolve_LDADD = \
+	libshared.la
+
 automake_sources = $(patsubst src/libsystemd/%,$(outdir)/%,$(filter %.c,$($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES)))
 $(eval $(value automake2autothing))
 _subdirs := $(notdir $(patsubst %/,%,$(dir $(call automake_sources,libsystemd-internal.la))))
diff --git a/src/bus-proxyd/Makefile b/src/systemd-bus-proxyd/Makefile
index ef70e3e456..83f3552d6d 100644
--- a/src/bus-proxyd/Makefile
+++ b/src/systemd-bus-proxyd/Makefile
@@ -23,22 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-noinst_LTLIBRARIES += \
-	libbus-proxy-core.la
-
-libbus_proxy_core_la_SOURCES = \
-	src/bus-proxyd/bus-xml-policy.c \
-	src/bus-proxyd/bus-xml-policy.h \
-	src/bus-proxyd/driver.c \
-	src/bus-proxyd/driver.h \
-	src/bus-proxyd/proxy.c \
-	src/bus-proxyd/proxy.h \
-	src/bus-proxyd/synthesize.c \
-	src/bus-proxyd/synthesize.h
-
-libbus_proxy_core_la_LIBADD = \
-	libshared.la
-
 systemd_bus_proxyd_SOURCES = \
 	src/bus-proxyd/bus-proxyd.c
 
@@ -46,13 +30,6 @@ systemd_bus_proxyd_LDADD = \
 	libbus-proxy-core.la \
 	libshared.la
 
-systemd_stdio_bridge_SOURCES = \
-	src/bus-proxyd/stdio-bridge.c
-
-systemd_stdio_bridge_LDADD = \
-	libbus-proxy-core.la \
-	libshared.la
-
 nodist_systemunit_DATA += \
 	units/systemd-bus-proxyd.service
 
diff --git a/src/bus-proxyd/bus-proxyd.c b/src/systemd-bus-proxyd/bus-proxyd.c
index 17b80c3e9a..17b80c3e9a 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/systemd-bus-proxyd/bus-proxyd.c
diff --git a/src/systemd-stdio-bridge/Makefile b/src/systemd-stdio-bridge/Makefile
new file mode 100644
index 0000000000..24852e78ed
--- /dev/null
+++ b/src/systemd-stdio-bridge/Makefile
@@ -0,0 +1,34 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  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
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public License
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
+
+systemd_stdio_bridge_SOURCES = \
+	src/bus-proxyd/stdio-bridge.c
+
+systemd_stdio_bridge_LDADD = \
+	libbus-proxy-core.la \
+	libshared.la
+
+$(eval $(value automake2autothing))
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/bus-proxyd/stdio-bridge.c b/src/systemd-stdio-bridge/stdio-bridge.c
index 60c4a08325..60c4a08325 100644
--- a/src/bus-proxyd/stdio-bridge.c
+++ b/src/systemd-stdio-bridge/stdio-bridge.c