clean up tools/

1 files changed, 757 insertions, 0 deletions

diff --git a/tools/notsd-move b/tools/notsd-move
new file mode 100755
index 0000000000..3a9f4b4a8c
--- /dev/null
+++ b/tools/notsd-move
@@ -0,0 +1,757 @@
+#!/usr/bin/env bash
+
+in_array() {
+	local needle=$1; shift
+	local item
+	for item in "$@"; do
+		[[ $item = $needle ]] && return 0 # Found
+	done
+	return 1 # Not Found
+}
+
+split_lib() {
+	local d=$1
+
+	local t=("$d"/test-*)
+	if [[ -f ${t[0]} ]]; then
+		mkdir "$d/test"
+		mv "$d"/test-* -t "$d/test"
+	fi
+
+	mkdir "$d/src"
+	mv "$d"/*.c -t "$d/src"
+
+	local h=${d##*/lib}
+	mkdir "$d/include"
+	mkdir "$d/include/$h"
+	mv "$d"/*.h -t "$d/include/$h"
+}
+
+grp() {
+	local grp=$1
+	shift
+	if [[ -d "${grp}.d" ]]; then
+		mv -T "${grp}.d" "$grp"
+	else
+		mkdir "$grp"
+	fi
+	mv "$@" -t "$grp"
+}
+
+move_files() (
+	# first focus on getting directories to the right names.
+	mv -T src/{,systemd-}dbus1-generator
+	mv -T src/{,systemd-}debug-generator
+	mv -T src/{,systemd-}fstab-generator
+	mv -T src/{,systemd-}getty-generator
+	mv -T src/{,systemd-}gpt-auto-generator
+	mv -T src/{,systemd-}rc-local-generator
+	mv -T src/{,systemd-}system-update-generator
+	mv -T src/{,systemd-}sysv-generator
+
+	mv -T src/{,systemd-}ac-power
+	mv -T src/{,systemd-}analyze
+	mv -T src/{,systemd-}ask-password
+	mv -T src/{,systemd-}backlight
+	mv -T src/{,systemd-}binfmt
+	mv -T src/{,systemd-}cgls
+	mv -T src/{,systemd-}cgroups-agent
+	mv -T src/{,systemd-}cgtop
+	mv -T src/{,systemd-}cryptsetup
+	mv -T src/{,systemd-}delta
+	mv -T src/{,systemd-}detect-virt
+	mv -T src/{,systemd-}escape
+	mv -T src/{,systemd-}firstboot
+	mv -T src/{,systemd-}fsck
+	mv -T src/{,systemd-}hibernate-resume
+	mv -T src/{,systemd-}hwdb
+	mv -T src/{,systemd-}initctl
+	mv -T src/{,systemd-}machine-id-setup
+	mv -T src/{,systemd-}modules-load
+	mv -T src/{,systemd-}notify
+	mv -T src/{,systemd-}nspawn
+	mv -T src/{,systemd-}path
+	mv -T src/{,systemd-}quotacheck
+	mv -T src/{,systemd-}random-seed
+	mv -T src/{,systemd-}remount-fs
+	mv -T src/{,systemd-}reply-password
+	mv -T src/{,systemd-}rfkill
+	mv -T src/{,systemd-}run
+	mv -T src/{,systemd-}sleep
+	mv -T src/{,systemd-}stdio-bridge
+	mv -T src/{,systemd-}sysctl
+	mv -T src/{,systemd-}sysusers
+	mv -T src/{,systemd-}tmpfiles
+	mv -T src/{,systemd-}tty-ask-password-agent
+	mv -T src/{,systemd-}update-done
+	mv -T src/{,systemd-}update-utmp
+	mv -T src/{,systemd-}user-sessions
+	mv -T src/vconsole     src/systemd-vconsole-setup
+	mv -T src/socket-proxy src/systemd-socket-proxyd
+	mv -T src/timesync     src/systemd-timesyncd
+	mv -T src/activate     src/systemd-socket-activate
+
+	mv src/udev/*_id      -t src
+	mv src/udev/mtd_probe -t src
+	mv src/udev/collect   -t src
+
+	mv -T src/boot/efi src/systemd-boot
+	mv -T src/boot     src/bootctl
+
+	mkdir src/libsystemd/src
+	mv -t src/libsystemd/src src/libsystemd/sd-*
+	mkdir src/libsystemd/include
+	mv -T src/systemd src/libsystemd/include/systemd
+
+	mkdir src/busctl
+	mv src/libsystemd/src/sd-bus/busctl* -t src/busctl
+
+	mkdir src/systemd
+	mv -t src/systemd \
+	   src/core/main* \
+	   src/core/*systemd* \
+	   src/core/system.conf \
+	   src/core/user.conf
+	mkdir src/systemd-shutdown
+	mv -t src/systemd-shutdown \
+	   src/core/shutdown* \
+	   src/core/umount*
+	mv -T src/{,lib}core
+
+	mv -T src/{,lib}basic
+	mv -T src/{,lib}shared
+
+	mv -T src/lib{shared,core}/linux
+
+	mkdir src/libfirewall
+	mv -T src/lib{shared,firewall}/firewall-util.c
+	mv -T src/lib{shared,firewall}/firewall-util.h
+
+	split_lib src/libbasic
+	split_lib src/libsystemd-network
+
+	split_lib src/libshared
+	mv src/libshared/{test,include/shared}/test-tables.h
+	rmdir src/libshared/test
+
+	mkdir src/systemd-hibernate-resume-generator
+	mv -t src/systemd-hibernate-resume-generator \
+	   src/systemd-hibernate-resume/*generator*
+
+	# src/resolve => src/{libbasic-dns,resolve,resolved}
+	mkdir src/libbasic-dns
+	mv -t src/libbasic-dns \
+	   src/resolve/dns-type.{c,h} \
+	   src/resolve/resolved-dns-{answer,dnssec,packet,question,rr}.{c,h} \
+	   src/resolve/test-*
+	mkdir src/systemd-resolve
+	mv -t src/systemd-resolve \
+	   src/resolve/resolve-tool.c
+	mkdir src/systemd-resolved
+	mv -t src/systemd-resolved \
+	   src/resolve/.gitignore \
+	   src/resolve/*
+	rmdir src/resolve
+
+	# src/import => src/{libimport,systemd-{export,importd,import}}
+	mkdir src/libimport
+	mv -t src/libimport \
+	   src/import/import-common.{c,h} \
+	   src/import/import-compress.{c,h} \
+	   src/import/qcow2-util.{c,h} \
+	   src/import/test-qcow2.c
+	mkdir src/systemd-export
+	mv -t src/systemd-export \
+	   src/import/export*
+	mkdir src/systemd-importd
+	mv -t src/systemd-importd \
+	   src/import/.gitignore \
+	   src/import/importd.c \
+	   src/import/org.*
+	mkdir src/systemd-import
+	mv -t src/systemd-import \
+	   src/import/import*
+	mkdir src/systemd-pull
+	mv -t src/systemd-pull \
+	   src/import/pull* \
+	   src/import/curl-util*
+	rmdir src/import
+
+	# src/journal => src/..
+	mkdir src/libjournal-core
+	mv -t src/libjournal-core \
+	   src/journal/.gitignore \
+	   src/journal/journald-* \
+	   src/journal/test-*
+	mkdir src/systemd-cat
+	mv -t src/systemd-cat \
+	   src/journal/cat.c
+	mkdir src/journalctl
+	mv -t src/journalctl \
+	   src/journal/journal-qrcode.{c,h} \
+	   src/journal/journalctl.c
+	mkdir src/systemd-journald
+	mv -t src/systemd-journald \
+	   src/journal/journald.*
+	mkdir src/libsystemd/src/sd-journal
+	mv -t src/libsystemd/src/sd-journal \
+	   src/journal/audit-type.c \
+	   src/journal/audit-type.h \
+	   src/journal/catalog.c \
+	   src/journal/catalog.h \
+	   src/journal/compress.c \
+	   src/journal/compress.h \
+	   src/journal/fsprg.c \
+	   src/journal/fsprg.h \
+	   src/journal/journal-authenticate.c \
+	   src/journal/journal-authenticate.h \
+	   src/journal/journal-def.h \
+	   src/journal/journal-file.c \
+	   src/journal/journal-file.h \
+	   src/journal/journal-internal.h \
+	   src/journal/journal-send.c \
+	   src/journal/journal-vacuum.c \
+	   src/journal/journal-vacuum.h \
+	   src/journal/journal-verify.c \
+	   src/journal/journal-verify.h \
+	   src/journal/lookup3.c \
+	   src/journal/lookup3.h \
+	   src/journal/mmap-cache.c \
+	   src/journal/mmap-cache.h \
+	   src/journal/sd-journal.c
+	rmdir src/journal
+
+	# src/network => src/...
+	mkdir src/systemd-networkd-wait-online
+	mv -t src/systemd-networkd-wait-online \
+	   src/network/networkd-wait-online*
+	mkdir src/libnetworkd-core
+	mv -t src/libnetworkd-core \
+	   src/network/.gitignore \
+	   src/network/networkd-*
+	mkdir src/networkctl
+	mv -t src/networkctl \
+	   src/network/networkctl.c
+	mkdir src/systemd-networkd
+	mv -t src/systemd-networkd \
+	   src/network/networkd* \
+	   src/network/org.*
+	mkdir src/grp-network.d
+	mv -t src/grp-network.d \
+	   src/network/test-*
+	rmdir src/network
+
+	# src/machine => src/{machinectl,systemd-machined}
+	mkdir src/machinectl
+	mv -t src/machinectl \
+	   src/machine/machinectl*
+	mkdir src/systemd-machined
+	mv -t src/systemd-machined \
+	   src/machine/.gitignore \
+	   src/machine/*
+	rmdir src/machine
+
+	# src/coredump => src/{coredumpctl,systemd-coredump}
+	mkdir src/coredumpctl
+	mv -t src/coredumpctl \
+	   src/coredump/coredumpctl*
+	mkdir src/systemd-coredump
+	mv -t src/systemd-coredump \
+	   src/coredump/*
+	rmdir src/coredump
+
+	# src/hostname => src/{hostnamectl,systemd-hostnamed}
+	mkdir src/hostnamectl
+	mv -t src/hostnamectl \
+	   src/hostname/hostnamectl*
+	mkdir src/systemd-hostnamed
+	mv -t src/systemd-hostnamed \
+	   src/hostname/.gitignore \
+	   src/hostname/*
+	rmdir src/hostname
+
+	# src/journal-remote => src/...
+	mkdir src/systemd-journal-gatewayd
+	mv -t src/systemd-journal-gatewayd \
+	   src/journal-remote/journal-gateway*
+	mkdir src/systemd-journal-remote
+	mv -t src/systemd-journal-remote \
+	   src/journal-remote/journal-remote*
+	mkdir src/systemd-journal-upload
+	mv -t src/systemd-journal-upload \
+	   src/journal-remote/journal-upload*
+	mkdir src/grp-remote.d
+	mv -t src/grp-remote.d \
+	   src/journal-remote/.gitignore \
+	   src/journal-remote/browse.html \
+	   src/journal-remote/log-generator.py \
+	   src/journal-remote/microhttpd*
+	rmdir src/journal-remote
+
+	# src/locale => src/...
+	mkdir src/localectl
+	mv -t src/localectl \
+	   src/locale/localectl*
+	mkdir src/systemd-localed
+	mv -t src/systemd-localed \
+	   src/locale/.gitignore \
+	   src/locale/*
+	rmdir src/locale
+
+	# src/login => src/...
+	mkdir src/grp-login.d
+	mv -t src/grp-login.d \
+	   src/login/.gitignore \
+	   src/login/test-*
+	mkdir src/loginctl
+	mv -t src/loginctl \
+	   src/login/loginctl* \
+	   src/login/sysfs-show*
+	mkdir src/pam_systemd
+	mv -t src/pam_systemd \
+	   src/login/pam*
+	mkdir src/systemd-inhibit
+	mv -t src/systemd-inhibit \
+	   src/login/inhibit*
+	mkdir src/systemd-logind
+	mv -t src/systemd-logind \
+	   src/login/logind* \
+	   src/login/*.rules \
+	   src/login/*.rules.in \
+	   src/login/org.*
+	mv -T src/login/systemd-user.m4 src/systemd-logind/systemd-user.pam.m4
+	rmdir src/login
+
+	# src/timedate => src/...
+	mkdir src/timedatectl
+	mv -t src/timedatectl \
+	   src/timedate/timedatectl*
+	mkdir src/systemd-timedated
+	mv -t src/systemd-timedated \
+	   src/timedate/.gitignore \
+	   src/timedate/timedated* \
+	   src/timedate/org.*
+	rmdir src/timedate
+
+	# src/udev => src/...
+	mv -T src/udev/udev.h src/libudev/udev.h
+	mkdir src/udevadm
+	mv -t src/udevadm \
+	   src/udev/udevadm*
+	mkdir src/libudev-core
+	mv -t src/libudev-core \
+	   src/udev/net \
+	   src/udev/udev-*
+	mkdir src/systemd-udevd
+	mv -t src/systemd-udevd \
+	   src/udev/udev.conf* \
+	   src/udev/udevd*
+	mkdir src/grp-udev.d
+	mv -t src/grp-udev.d \
+	   src/udev/.gitignore \
+	   src/udev/udev.*
+	rm src/udev/.vimrc
+	rmdir src/udev
+
+	# .conf is such a useless suffix
+	for ext in sysctl sysusers tmpfiles; do
+		for file in $ext.d/*.conf*; do
+			mv -T "$file" "${file/.conf/.$ext}"
+		done
+	done
+	for ext in xorg; do
+		for file in $ext/*.sh*; do
+			mv -T "$file" "${file/.sh/.$ext}"
+		done
+	done
+
+	# less obvious manpage groups
+	mv -T man/{glib-event-glue,sd_event_get_fd-glib-example}.c
+	mv -T man/systemd-{halt.service,shutdown}.xml
+	mv -T man/systemd-{suspend.service,sleep}.xml
+	mv -t src/libsystemd \
+	   man/libsystemd* \
+	   man/sd*
+	mv -t src/libudev \
+	   man/udev_*
+	mkdir src/manpages
+	mv -t src/manpages \
+	   man/daemon.xml \
+	   man/file-hierarchy.xml \
+	   man/hostname.xml \
+	   man/locale.conf.xml \
+	   man/localtime.xml \
+	   man/machine-id.xml \
+	   man/machine-info.xml \
+	   man/os-release.xml
+	mv -t src/systemctl \
+	   man/halt.xml \
+	   man/runlevel.xml \
+	   man/shutdown.xml \
+	   man/telinit.xml \
+	   man/systemd.preset.xml
+	mv -t src/systemd \
+	   man/systemd-system.conf.xml
+	mkdir src/grp-system.d
+	mv -t src/grp-system.d \
+	   man/bootup.xml \
+	   man/kernel-command-line.xml
+	mv -t src/systemd-udevd \
+	   man/udev.conf.xml
+	mv -t src/grp-udev.d \
+	   man/udev.xml
+	mv -t src/systemd-cryptsetup \
+	   man/*crypt*
+	mv -t src/systemd-machine-id-setup \
+	   man/systemd-machine-id*
+	mv -t src/systemd-path src/libsystemd/include/systemd/sd-path*
+	mv -t src/systemd-path src/libsystemd/src/sd-path/*
+	rmdir src/libsystemd/src/sd-path
+	mv -t src/systemd-resolved \
+	   man/dnssec-trust-anchors*
+	mv -t src/systemd-tty-ask-password-agent \
+	   man/systemd-ask-password-console*
+
+	# less obvious unit groups
+	# suffix these with '*' in case they gain or lose the .in suffix.
+	for thing in hibernate hybrid-sleep suspend; do
+		mv -t src/systemd-sleep \
+		   units/"$thing".target* \
+		   units/systemd-"$thing".service*
+	done
+	for thing in halt kexec poweroff reboot; do
+		mv -t src/systemd-shutdown \
+		   units/"$thing".target* \
+		   units/systemd-"$thing".service*
+	done
+	mv -t src/systemd-binfmt \
+	   units/*binfmt*
+	mv -t src/systemd-modules-load \
+	   units/kmod*
+	mv -t src/systemd-quotacheck \
+	   units/quota*
+	mv -t src/systemd-journald \
+	   units/*journald*
+	mv -t src/systemd-cryptsetup \
+	   units/cryptsetup*
+	mv -t src/systemd-logind \
+	   units/user.slice*
+	mv -t src/systemd-machined \
+	   units/machine.slice*
+
+	# muck
+	mv -t src/libbasic/include/basic src/libbasic/.gitignore
+	mv -T {test,src/systemd-boot}/test-efi-create-disk.sh
+	mv -t src/systemd-tmpfiles units/systemd-tmpfiles*
+	mv -t src/systemd-tmpfiles \
+	   tmpfiles.d/tmp.* \
+	   tmpfiles.d/var.* \
+	   tmpfiles.d/etc.* \
+	   tmpfiles.d/home.* \
+	   tmpfiles.d/*nologin* \
+	   tmpfiles.d/legacy.* \
+	   tmpfiles.d/x11.*
+	mv -t src/systemd-sysusers \
+	   sysusers.d/.gitignore \
+	   sysusers.d/basic*
+	mkdir src/libudev/src
+	mv -t src/libudev/src src/libudev/*.{c,h}
+	mkdir src/libudev/include
+	mv -T src/libudev/{src,include}/libudev.h
+	mv -T src/{systemd-networkd,libnetworkd-core}/networkd.h
+	mv -T src/{systemd-resolved,libbasic-dns}/resolved-def.h
+	mv -t src/cdrom_id  rules/*cdrom*
+	mv -t src/mtd_probe rules/*mtd*
+	mv -t src/v4l_id    rules/*v4l*
+	mv -t src/libsystemd-network/include/systemd-network \
+	   src/libsystemd/include/systemd/sd-dhcp* \
+	   src/libsystemd/include/systemd/sd-ipv4* \
+	   src/libsystemd/include/systemd/sd-lldp* \
+	   src/libsystemd/include/systemd/sd-ndisc*
+	for l in device hwdb netlink network resolve; do
+		mv -T src/libsystemd/include/systemd/sd-$l.h src/libsystemd/src/sd-$l/sd-$l.h
+	done
+	mkdir src/grp-journal.d
+	mv -t src/grp-journal.d tmpfiles.d/journal-nocow.*
+	mv -t src/grp-remote.d tmpfiles.d/systemd-remote.*
+	mv -T tmpfiles.d/systemd{,-journald}.tmpfiles.m4
+	mv -t src/systemd tmpfiles.d/systemd-tmpfs.tmpfiles*
+	mv -t src/systemd xorg/??-systemd-user.*; rmdir xorg
+	mv -t src/systemd-vconsole-setup man/vconsole.conf.xml
+	mv -t src/systemd-coredump \
+	   sysctl.d/*coredump*
+	mv -t src/systemd-sysctl \
+	   sysctl.d/??-default.*
+
+	mv -t src/systemd-sysv-generator \
+	   docs/sysvinit/.gitignore \
+	   docs/sysvinit/*
+	rmdir docs/sysvinit
+	mv -t src/grp-journal.d \
+	   docs/var-log/.gitignore \
+	   docs/var-log/*
+	rmdir docs/var-log
+	rm docs/.gitignore
+	rmdir docs
+
+	# auto-distribute the stuff
+	for d in man units sysusers.d tmpfiles.d; do
+		pushd $d >/dev/null
+		for file in *; do
+			base=${file%%.*}
+			base=${base%%@*}
+			if [[ -d ../src/"${base}" ]]; then
+				mv "$file" -t ../src/"${base}"
+			elif [[ -d ../src/"${base#systemd-}" ]]; then
+				mv "$file" -t ../src/"${base#systemd-}"
+			elif [[ -d ../src/systemd-"${base}" ]]; then
+				mv "$file" -t ../src/systemd-"${base}"
+			fi
+		done
+		popd >/dev/null
+	done
+	rmdir sysusers.d #tmpfiles.d
+
+	pushd shell-completion/bash >/dev/null
+	mv -T  systemctl.in ../../src/systemctl/systemctl.completion.bash.in
+	cat .gitignore   >> ../../src/systemctl/.gitignore
+	rm .gitignore
+	for file in *; do
+		if [[ -d ../../src/"$file" ]]; then
+			mv -T "$file" "../../src/$file/$file.completion.bash"
+		fi
+	done
+	popd >/dev/null
+	rmdir shell-completion/bash
+
+	pushd shell-completion/zsh >/dev/null
+	mv -T _systemctl.in ../../src/systemctl/systemctl.completion.zsh.in
+	cat .gitignore   >> ../../src/systemctl/.gitignore
+	rm .gitignore
+	for file in _*; do
+		if [[ -d ../../src/"${file#_}" ]]; then
+			mv -T "$file" "../../src/${file#_}/${file#_}.completion.zsh"
+		fi
+	done
+	popd >/dev/null
+	mv -T shell-completion/zsh src/zsh-completion
+	rmdir shell-completion
+
+	# do this *after* auto-splitting, because of
+	# systemd-journal-{gatewayd,remote,upload}.
+	mv -t src/journalctl \
+	   units/*journal*
+	# fix a false positive
+	mv -t units \
+	   src/systemd-shutdown/shutdown.target
+
+	# categorize
+	grp src/grp-boot \
+	    src/bootctl \
+	    src/kernel-install \
+	    src/systemd-boot
+	grp src/grp-coredump \
+	    src/coredumpctl \
+	    src/systemd-coredump
+	grp src/grp-hostname \
+	    src/hostnamectl \
+	    src/systemd-hostnamed
+	grp src/grp-initprogs \
+	    src/systemd-backlight \
+	    src/systemd-binfmt \
+	    src/systemd-detect-virt \
+	    src/systemd-firstboot \
+	    src/systemd-fsck \
+	    src/systemd-modules-load \
+	    src/systemd-quotacheck \
+	    src/systemd-random-seed \
+	    src/systemd-rfkill \
+	    src/systemd-sysctl \
+	    src/systemd-sysusers \
+	    src/systemd-tmpfiles \
+	    src/systemd-update-done \
+	    src/systemd-update-utmp \
+	    src/systemd-user-sessions \
+	    src/systemd-vconsole-setup
+	grp src/grp-initprogs/grp-sleep \
+	    src/systemd-hibernate-resume \
+	    src/systemd-hibernate-resume-generator \
+	    src/systemd-sleep
+	grp src/grp-remote \
+	    src/systemd-journal-gatewayd \
+	    src/systemd-journal-remote \
+	    src/systemd-journal-upload
+	grp src/grp-journal \
+	    catalog \
+	    src/grp-remote \
+	    src/journalctl \
+	    src/libjournal-core \
+	    src/systemd-cat \
+	    src/systemd-journald
+	grp src/grp-locale \
+	    src/localectl \
+	    src/systemd-localed
+	grp src/grp-login \
+	    src/loginctl \
+	    src/pam_systemd \
+	    src/systemd-inhibit \
+	    src/systemd-logind
+	grp src/grp-machine \
+	    src/machinectl \
+	    src/nss-mymachines \
+	    src/systemd-machined
+	grp src/grp-machine/grp-import \
+	    src/libimport \
+	    src/systemd-export \
+	    src/systemd-import \
+	    src/systemd-importd \
+	    src/systemd-pull
+	grp src/grp-network \
+	    network \
+	    src/libnetworkd-core \
+	    src/networkctl \
+	    src/systemd-networkd \
+	    src/systemd-networkd-wait-online
+	grp src/grp-resolve \
+	    src/libbasic-dns \
+	    src/nss-resolve \
+	    src/systemd-resolve \
+	    src/systemd-resolved
+	grp src/grp-system \
+	    src/libcore \
+	    src/systemctl \
+	    src/systemd \
+	    src/systemd-shutdown
+	grp src/grp-system/grp-utils \
+	    src/systemd-analyze \
+	    src/systemd-delta \
+	    src/systemd-fstab-generator \
+	    src/systemd-run \
+	    src/systemd-sysv-generator
+	grp src/grp-timedate \
+	    src/systemd-timedated \
+	    src/timedatectl
+	grp src/grp-udev \
+	    rules \
+	    hwdb \
+	    src/libudev-core \
+	    src/*_id \
+	    src/collect \
+	    src/mtd_probe \
+	    src/systemd-hwdb \
+	    src/systemd-udevd \
+	    src/udevadm
+	grp src/grp-utils \
+	    src/systemd-ac-power \
+	    src/systemd-escape \
+	    src/systemd-notify \
+	    src/systemd-path \
+	    src/systemd-socket-activate
+
+	mv -t src/systemd-timesyncd system-preset/??-timesyncd.preset
+	for file in system-preset/??-*.preset; do
+		base="${file##*/??-}"
+		base="${base%.preset}"
+		base="${base%d}"
+		mv -t src/grp-"$base" "$file"
+	done
+	rmdir system-preset
+)
+
+breakup_makefile() (
+        touch .tmp.move.all
+        files=(.tmp.move.all)
+        file=/dev/null
+        IFS=''
+        while read -r line; do
+                if [[ $line = '#@'* ]]; then
+                        file="${line#'#@'}"
+                        file="${file%% *}"
+                elif [[ $file = all ]]; then
+                        printf '%s\n' "$line" | tee -a "${files[@]}" >/dev/null
+                else
+			if ! in_array "$file" "${files[@]}"; then
+				cat .tmp.move.all > "$file"
+				files+=("$file")
+			fi
+                        printf '%s\n' "$line" >> "$file"
+                fi
+        done < <(fixup_makefile <Makefile.am)
+        rm .tmp.move.all
+
+	sed -ri \
+	    -e '/^	\$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
+	    -e 's/ \$\(CFLAGS\) / /g' \
+	    -e 's/ \$\(CPPFLAGS\) / /g' \
+	    -e 's/ \$\(AM_CPPFLAGS\) / $(sd.ALL_CPPFLAGS) /g' \
+	    -e '/^[^#	]*:/ { s|\S+/|$(outdir)/|g }' \
+	    src/libbasic/include/basic/Makefile \
+	    src/libsystemd/src/Makefile \
+	    src/libsystemd/src/sd-journal/Makefile \
+	    src/grp-udev/libudev-core/Makefile
+)
+
+fixup_makefile() {
+	sed -r \
+	    -e '/^[^#	]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \
+	    -e 's|^if (.*)|ifneq ($(\1),)|' \
+	    -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g'
+}
+
+breakup_zshcompletion() (
+	sed_expr='
+		1 {
+			i #compdef %s
+			d
+		}
+		/^case/,/^esac/ {
+			/^    %s)/,/^    ;;/ {
+				s/^        //p
+			}
+			d
+		}
+	'
+
+	cd shell-completion/zsh
+	read -r _ cmds < _systemd
+	for cmd in $cmds; do
+		printf -v cmd_sed_expr "$sed_expr" $cmd $cmd
+		sed -e "$cmd_sed_expr" < _systemd > _$cmd
+	done
+	rm _systemd
+)
+
+move() (
+        find . \( -name Makefile -o -name '*.mk' \) -delete
+
+	>&2 echo ' => breakup_zshcompletion'
+	breakup_zshcompletion
+	>&2 echo ' => move_files'
+	move_files
+	>&2 echo ' => breakup_makefile'
+	breakup_makefile
+	>&2 echo ' => ./tools/notsd-fixup'
+	./tools/notsd-fixup
+)
+
+main() {
+	set -e
+
+	if [[ -n "$(git status -s)" ]] || [[ -n "$(git clean -xdn)" ]]; then
+		echo 'There are changes in the current directory.' >&2
+		exit 1
+	fi
+
+	git checkout -b tmp/postmove
+
+	move
+
+	git add .
+	git commit -m './tools/notsd-move'
+	git merge -s ours notsystemd/postmove
+	git checkout notsystemd/postmove
+	git merge tmp/postmove
+	git branch -d tmp/postmove
+}
+
+main "$@"