stuff

2 files changed, 53 insertions, 31 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/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() (