From fc18b7fdd1286d96a4cc36b74e4da81c6ad6a326 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Mon, 13 Jun 2016 11:44:51 -0400
Subject: more

---
 Makefile.am | 23 +++++++++++++++--------
 move.sh     | 21 ++++++++++++++++++---
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cf5c307fe0..090f68b1fa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3689,16 +3689,18 @@ noinst_LTLIBRARIES += \
 libudev_internal_la_SOURCES =\
 	$(libudev_la_SOURCES)
 
-#@src/udev/Makefile ------------------------------------------------------------
+#@src/grp-udev/Makefile --------------------------------------------------------
 INSTALL_DIRS += \
 	$(sysconfdir)/udev/rules.d
 
+#@src/grp-network/Makefile
 dist_network_DATA = \
 	network/99-default.link \
 	network/80-container-host0.network \
 	network/80-container-ve.network \
 	network/80-container-vz.network
 
+#@src/grp-udev/Makefile
 dist_udevrules_DATA += \
 	rules/50-udev-default.rules \
 	rules/60-block.rules \
@@ -3742,12 +3744,15 @@ SYSINIT_TARGET_WANTS += \
 	systemd-udevd.service \
 	systemd-udev-trigger.service
 
+#@src/grp-udev/udevadm/Makefile
 rootbin_PROGRAMS += \
 	udevadm
 
+#@src/grp-udev/systemd-udevd/Makefile
 rootlibexec_PROGRAMS += \
 	systemd-udevd
 
+#@src/grp-udev/libudev-core/Makefile
 noinst_LTLIBRARIES += \
 	libudev-core.la
 
@@ -3824,12 +3829,14 @@ libudev_core_la_SOURCES += \
 	src/systemd/sd-login.h
 endif # HAVE_ACL
 
+#@src/grp-udev/systemd-udevd/Makefile
 systemd_udevd_SOURCES = \
 	src/udev/udevd.c
 
 systemd_udevd_LDADD = \
 	libudev-core.la
 
+#@src/grp-udev/udevadm/Makefile
 udevadm_SOURCES = \
 	src/udev/udevadm.c \
 	src/udev/udevadm-info.c \
@@ -3956,7 +3963,7 @@ EXTRA_DIST += \
 	test/sysv-generator-test.py \
 	test/mocks/fsck
 
-#@src/udev/ata_id/Makefile -----------------------------------------------------
+#@src/grp-udev/ata_id/Makefile -------------------------------------------------
 ata_id_SOURCES = \
 	src/udev/ata_id/ata_id.c
 
@@ -3966,7 +3973,7 @@ ata_id_LDADD = \
 udevlibexec_PROGRAMS += \
 	ata_id
 
-#@src/udev/cdrom_id/Makefile ---------------------------------------------------
+#@src/grp-udev/cdrom_id/Makefile -----------------------------------------------
 cdrom_id_SOURCES = \
 	src/udev/cdrom_id/cdrom_id.c
 
@@ -3979,7 +3986,7 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
 	rules/60-cdrom_id.rules
 
-#@src/udev/collect/Makefile ----------------------------------------------------
+#@src/grp-udev/collect/Makefile ------------------------------------------------
 collect_SOURCES = \
 	src/udev/collect/collect.c
 
@@ -3989,7 +3996,7 @@ collect_LDADD = \
 udevlibexec_PROGRAMS += \
 	collect
 
-#@src/udev/scsi_id/Makefile ----------------------------------------------------
+#@src/grp-udev/scsi_id/Makefile ------------------------------------------------
 scsi_id_SOURCES =\
 	src/udev/scsi_id/scsi_id.c \
 	src/udev/scsi_id/scsi_serial.c \
@@ -4005,7 +4012,7 @@ udevlibexec_PROGRAMS += \
 EXTRA_DIST += \
 	src/udev/scsi_id/README
 
-#@src/udev/v4l_id/Makefile -----------------------------------------------------
+#@src/grp-udev/v4l_id/Makefile -------------------------------------------------
 v4l_id_SOURCES = \
 	src/udev/v4l_id/v4l_id.c
 
@@ -4018,7 +4025,7 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
 	rules/60-persistent-v4l.rules
 
-#@src/udev/mtd_probe/Makefile --------------------------------------------------
+#@src/grp-udev/mtd_probe/Makefile ----------------------------------------------
 mtd_probe_SOURCES =  \
 	src/udev/mtd_probe/mtd_probe.c \
 	src/udev/mtd_probe/mtd_probe.h \
@@ -4970,7 +4977,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-timedated.service.in
 
-#@src/systemd-timesync/Makefile ------------------------------------------------
+#@src/systemd-timesyncd/Makefile -----------------------------------------------
 if ENABLE_TIMESYNCD
 systemd_timesyncd_SOURCES = \
 	src/timesync/timesyncd.c \
diff --git a/move.sh b/move.sh
index a175eb2dfa..c0b577761e 100755
--- a/move.sh
+++ b/move.sh
@@ -77,7 +77,13 @@ move_files() (
 		mv -T src/{,systemd-}$d
 	done
 
-	mv -T src/systemd-socket-proxy{,d}
+	dmon=(
+		systemd-socket-proxy
+		systemd-timesync
+	)
+	for d in "${dmon[@]}"; do
+		mv -T "src/$d"{,d}
+	done
 
 	mv -T {shell-completion/bash/,src/kernel-install/bash-completion_}kernel-install
 	mv -T {shell-completion/zsh/_,src/kernel-install/zsh-completion_}kernel-install
@@ -207,6 +213,16 @@ move_files() (
 	mv -T src/{,grp-}locale
 	mv -T src/{,grp-}login
 	mv -T src/{,grp-}network
+	mv -T src/{,grp-}udev
+
+	mkdir src/grp-udev/d-udevadm
+	mv src/grp-udev/udevadm* src/grp-udev/d-udevadm/
+	mkdir src/grp-udev/systemd-udevd
+	mv -T src/grp-udev/{,systemd-udevd}/udevd.c
+	mkdir src/grp-udev/libudev-core
+	mv src/grp-udev/udev* src/grp-udev/libudev-core/
+	mv -T src/grp-udev/{,libudev-core}/net
+	mv -T src/grp-udev/{d-,}udevadm
 )
 
 breakup_makefile() (
@@ -257,8 +273,7 @@ fixup_makefiles() (
 	    -e 's/ \$\(AM_CPPFLAGS\) / $(ALL_CPPFLAGS) /g' \
 	    -e '/^[^#	]*:/ { s|\S+/|$(outdir)/|g }' \
 	    src/libbasic/Makefile \
-	    src/libsystemd/libsystemd-journal-internal/Makefile \
-	    src/udev/Makefile
+	    src/libsystemd/libsystemd-journal-internal/Makefile
 	find -type f -name Makefile|while read -r filename; do
 		sed -r -i "s|(/\.\.)*/config.mk|/$(realpath -ms --relative-to="${filename%/*}" config.mk)|" "$filename"
 	done
-- 
cgit v1.2.3-54-g00ecf