./tools/notsd-fixup **/Makefile

30 files changed, 76 insertions, 39 deletions

diff --git a/src/Makefile b/src/Makefile
index 905d11d803..4c89439154 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -65,5 +65,6 @@ nested.subdirs += systemd-stdio-bridge
 nested.subdirs += systemd-system-update-generator
 nested.subdirs += systemd-timesyncd
 nested.subdirs += systemd-tty-ask-password-agent
+nested.subdirs += test
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-boot/Makefile b/src/grp-boot/Makefile
index 6f46e5e035..df1febe823 100644
--- a/src/grp-boot/Makefile
+++ b/src/grp-boot/Makefile
@@ -23,6 +23,8 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-nested.subdirs += bootctl systemd-boot kernel-install
+nested.subdirs += bootctl
+nested.subdirs += kernel-install
+nested.subdirs += systemd-boot
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-boot/systemd-boot/Makefile b/src/grp-boot/systemd-boot/Makefile
index 9766e1bb82..8b770c0c81 100644
--- a/src/grp-boot/systemd-boot/Makefile
+++ b/src/grp-boot/systemd-boot/Makefile
@@ -149,4 +149,5 @@ files.out.int += test-efi-disk.img
 # ------------------------------------------------------------------------------
 endif # HAVE_GNUEFI
 endif # ENABLE_EFI
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-coredump/Makefile b/src/grp-coredump/Makefile
index 811efb5af5..c2bbf948e9 100644
--- a/src/grp-coredump/Makefile
+++ b/src/grp-coredump/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-nested.subdirs += coredumpctl systemd-coredump
+nested.subdirs += coredumpctl
+nested.subdirs += systemd-coredump
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-hostname/Makefile b/src/grp-hostname/Makefile
index 319c1d2c8e..939c268c10 100644
--- a/src/grp-hostname/Makefile
+++ b/src/grp-hostname/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-nested.subdirs += systemd-hostnamed hostnamectl
+nested.subdirs += hostnamectl
+nested.subdirs += systemd-hostnamed
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile
index f42ecedcc8..764ab80758 100644
--- a/src/grp-journal/Makefile
+++ b/src/grp-journal/Makefile
@@ -170,10 +170,6 @@ endif # HAVE_COMPRESSION
 dist_tmpfiles_DATA = \
 	tmpfiles.d/journal-nocow.conf
 
-nested.subdirs += journalctl systemd-journald libjournal-core
-nested.subdirs += systemd-cat
-#nested.subdirs += grp-remote
-
 ifneq ($(HAVE_SYSV_COMPAT),)
 varlog_DATA = \
 	docs/var-log/README
@@ -188,4 +184,10 @@ EXTRA_DIST += \
 dist_systempreset_DATA = \
 	90-journald.preset
 
+nested.subdirs += grp-remote
+nested.subdirs += journalctl
+nested.subdirs += libjournal-core
+nested.subdirs += systemd-cat
+nested.subdirs += systemd-journald
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/systemd-cat/Makefile b/src/grp-journal/systemd-cat/Makefile
index a6d7eee6ea..77c0861f2c 100644
--- a/src/grp-journal/systemd-cat/Makefile
+++ b/src/grp-journal/systemd-cat/Makefile
@@ -29,7 +29,6 @@ systemd_cat_SOURCES = \
 systemd_cat_LDADD = \
 	libjournal-core.la
 
-
 bin_PROGRAMS += \
 	systemd-cat
 
diff --git a/src/grp-locale/Makefile b/src/grp-locale/Makefile
index 6dc11dc2d8..082d1f8eba 100644
--- a/src/grp-locale/Makefile
+++ b/src/grp-locale/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-nested.subdirs += systemd-localed localectl
+nested.subdirs += localectl
+nested.subdirs += systemd-localed
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/Makefile b/src/grp-login/Makefile
index be6adc4880..67083f42d5 100644
--- a/src/grp-login/Makefile
+++ b/src/grp-login/Makefile
@@ -56,9 +56,11 @@ tests += \
 	test-login-tables \
 	test-login-shared
 
-nested.subdirs += loginctl systemd-logind
-nested.subdirs += pam_systemd systemd-inhibit
-
 endif # ENABLE_LOGIND
 
+nested.subdirs += loginctl
+nested.subdirs += pam_systemd
+nested.subdirs += systemd-inhibit
+nested.subdirs += systemd-logind
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/loginctl/Makefile b/src/grp-login/loginctl/Makefile
index 7c8c3d91a0..d2c6eebd27 100644
--- a/src/grp-login/loginctl/Makefile
+++ b/src/grp-login/loginctl/Makefile
@@ -38,4 +38,5 @@ dist_bashcompletion_data += \
 	shell-completion/bash/loginctl
 
 dist_zshcompletion_data += shell-completion/zsh/_loginctl
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile
index 8c87421bb0..9bb3af70b0 100644
--- a/src/grp-login/pam_systemd/Makefile
+++ b/src/grp-login/pam_systemd/Makefile
@@ -53,4 +53,5 @@ dist_pamconf_DATA = \
 EXTRA_DIST += \
 	src/login/systemd-user.m4
 endif # HAVE_PAM
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-login/systemd-logind/Makefile b/src/grp-login/systemd-logind/Makefile
index 18b18a1683..cef1800e27 100644
--- a/src/grp-login/systemd-logind/Makefile
+++ b/src/grp-login/systemd-logind/Makefile
@@ -67,7 +67,6 @@ systemd_logind_LDADD = \
 rootlibexec_PROGRAMS += \
 	systemd-logind
 
-
 nodist_systemunit_DATA += \
 	units/systemd-logind.service
 
@@ -109,7 +108,6 @@ nodist_udevrules_DATA += \
 	src/login/71-seat.rules \
 	src/login/73-seat-late.rules
 
-
 polkitpolicy_in_files += \
 	src/login/org.freedesktop.login1.policy.in
 
diff --git a/src/grp-machine/Makefile b/src/grp-machine/Makefile
index c5225e44b5..9679410b7b 100644
--- a/src/grp-machine/Makefile
+++ b/src/grp-machine/Makefile
@@ -23,8 +23,9 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-nested.subdirs += machinectl systemd-machined
-nested.subdirs += nss-mymachines
 nested.subdirs += grp-import
+nested.subdirs += machinectl
+nested.subdirs += nss-mymachines
+nested.subdirs += systemd-machined
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/grp-import/Makefile b/src/grp-machine/grp-import/Makefile
index b996bd4c19..5cda3c9a9f 100644
--- a/src/grp-machine/grp-import/Makefile
+++ b/src/grp-machine/grp-import/Makefile
@@ -31,12 +31,6 @@ ifneq ($(HAVE_ZLIB),)
 ifneq ($(HAVE_BZIP2),)
 ifneq ($(HAVE_GCRYPT),)
 
-nested.subdirs += libimport
-nested.subdirs += systemd-export
-nested.subdirs += systemd-import
-nested.subdirs += systemd-importd
-nested.subdirs += systemd-pull
-
 endif # HAVE_GCRYPT
 endif # HAVE_BZIP2
 endif # HAVE_ZLIB
@@ -45,4 +39,10 @@ endif # HAVE_LIBCURL
 
 endif # ENABLE_IMPORTD
 
+nested.subdirs += libimport
+nested.subdirs += systemd-export
+nested.subdirs += systemd-import
+nested.subdirs += systemd-importd
+nested.subdirs += systemd-pull
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile
index c7c0d76907..78cb6419c0 100644
--- a/src/grp-machine/nss-mymachines/Makefile
+++ b/src/grp-machine/nss-mymachines/Makefile
@@ -23,7 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-
 libnss_mymachines_la_SOURCES = \
 	src/nss-mymachines/nss-mymachines.sym \
 	src/nss-mymachines/nss-mymachines.c
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile
index 182b52edd2..52016c3b5d 100644
--- a/src/grp-machine/systemd-machined/Makefile
+++ b/src/grp-machine/systemd-machined/Makefile
@@ -71,7 +71,6 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.machine1.busname
 
-
 polkitpolicy_in_files += \
 	src/machine/org.freedesktop.machine1.policy.in
 
diff --git a/src/grp-resolve/Makefile b/src/grp-resolve/Makefile
index 849af75af5..5e90fec8c7 100644
--- a/src/grp-resolve/Makefile
+++ b/src/grp-resolve/Makefile
@@ -27,6 +27,8 @@ dist_systempreset_DATA = \
 	90-resolved.preset
 
 nested.subdirs += libbasic-dns
-nested.subdirs += systemd-resolved systemd-resolve nss-resolve
+nested.subdirs += nss-resolve
+nested.subdirs += systemd-resolve
+nested.subdirs += systemd-resolved
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-resolve/libbasic-dns/Makefile b/src/grp-resolve/libbasic-dns/Makefile
index 3c9fe3e783..1d342c5f3b 100644
--- a/src/grp-resolve/libbasic-dns/Makefile
+++ b/src/grp-resolve/libbasic-dns/Makefile
@@ -47,7 +47,6 @@ libbasic_dns_la_SOURCES = \
 	src/resolve/dns-type.c \
 	src/resolve/dns-type.h
 
-
 tests += \
 	test-dns-packet \
 	test-resolve-tables \
diff --git a/src/grp-system/Makefile b/src/grp-system/Makefile
index d97f45afcd..e9c6d7b07f 100644
--- a/src/grp-system/Makefile
+++ b/src/grp-system/Makefile
@@ -26,8 +26,10 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 dist_systempreset_DATA = \
 	90-systemd.preset
 
-nested.subdirs += systemctl systemd systemd-shutdown
-nested.subdirs += libcore
 nested.subdirs += grp-utils
+nested.subdirs += libcore
+nested.subdirs += systemctl
+nested.subdirs += systemd
+nested.subdirs += systemd-shutdown
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-timedate/Makefile b/src/grp-timedate/Makefile
index 01c4f2f841..b9277c7c64 100644
--- a/src/grp-timedate/Makefile
+++ b/src/grp-timedate/Makefile
@@ -23,6 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-nested.subdirs += timedatectl systemd-timedated
+nested.subdirs += systemd-timedated
+nested.subdirs += timedatectl
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/Makefile b/src/grp-udev/Makefile
index 965c9b2f22..6b287f458c 100644
--- a/src/grp-udev/Makefile
+++ b/src/grp-udev/Makefile
@@ -74,7 +74,16 @@ SYSINIT_TARGET_WANTS += \
 	systemd-udevd.service \
 	systemd-udev-trigger.service
 
-nested.subdirs += systemd-udevd udevadm
-nested.subdirs += ata_id cdrom_id collect mtd_probe scsi_id v4l_id
+nested.subdirs += ata_id
+nested.subdirs += cdrom_id
+nested.subdirs += collect
+nested.subdirs += hwdb
+nested.subdirs += libudev-core
+nested.subdirs += mtd_probe
+nested.subdirs += scsi_id
+nested.subdirs += systemd-hwdb
+nested.subdirs += systemd-udevd
+nested.subdirs += udevadm
+nested.subdirs += v4l_id
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile
index 36aaa55431..e4bf7c64f3 100644
--- a/src/grp-udev/libudev-core/Makefile
+++ b/src/grp-udev/libudev-core/Makefile
@@ -97,8 +97,9 @@ endif # HAVE_ACL
 
 sd.libudev-core_SOURCES = $(patsubst src/udev/%,%,$(filter %.c,$(_libudev_core_la_SOURCES) $(_nodist_libudev_core_la_SOURCES)))
 $(outdir)/libudev-core.la: $(addprefix $(outdir)/,$(sd.libudev-core_SOURCES:.c=.lo))
-nested.subdirs += net
 $(outdir)/udev-builtin-keyboard.lo: $(outdir)/keyboard-keys-from-name.h
 sd.CPPFLAGS += -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
 
+nested.subdirs += net
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-utils/systemd-socket-activate/Makefile b/src/grp-utils/systemd-socket-activate/Makefile
index 7d69a80d36..da1a1a5e43 100644
--- a/src/grp-utils/systemd-socket-activate/Makefile
+++ b/src/grp-utils/systemd-socket-activate/Makefile
@@ -23,7 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-
 bin_PROGRAMS += \
 	systemd-socket-activate
 
diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile
index 47ce9cf936..3778a42f06 100644
--- a/src/libbasic/Makefile
+++ b/src/libbasic/Makefile
@@ -23,5 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-nested.subdirs += src include
+nested.subdirs += include
+nested.subdirs += src
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/include/Makefile b/src/libbasic/include/Makefile
index d3a3e62a0e..ac4e6e896a 100644
--- a/src/libbasic/include/Makefile
+++ b/src/libbasic/include/Makefile
@@ -24,4 +24,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 nested.subdirs += basic
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libbasic/include/basic/Makefile b/src/libbasic/include/basic/Makefile
index 8cebc9cac0..b1d41dc79d 100644
--- a/src/libbasic/include/basic/Makefile
+++ b/src/libbasic/include/basic/Makefile
@@ -29,14 +29,12 @@ $(outdir)/errno-list.txt: | $(outdir)/.deps
 $(outdir)/errno-to-name.h: $(outdir)/errno-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
-
 $(outdir)/af-list.txt:
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include sys/socket.h - </dev/null | grep -v AF_UNSPEC | grep -v AF_MAX | $(AWK) '/^#define[ \t]+AF_[^ \t]+[ \t]+PF_[^ \t]/ { print $$2; }' >$@
 
 $(outdir)/af-to-name.h: $(outdir)/af-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@
 
-
 $(outdir)/arphrd-list.txt:
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include net/if_arp.h - </dev/null | $(AWK) '/^#define[ \t]+ARPHRD_[^ \t]+[ \t]+[^ \t]/ { print $$2; }' | sed -e 's/ARPHRD_//' >$@
 
@@ -46,7 +44,6 @@ $(outdir)/arphrd-to-name.h: $(outdir)/arphrd-list.txt
 $(outdir)/arphrd-from-name.gperf: $(outdir)/arphrd-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@
 
-
 $(outdir)/cap-list.txt: $(srcdir)/missing.h
 	$(AM_V_GEN)$(CPP) $(sd.ALL_CPPFLAGS) -dM -include linux/capability.h -include $< - </dev/null | $(AWK) '/^#define[ \t]+CAP_[A-Z_]+[ \t]+/ { print $$2; }' | grep -v CAP_LAST_CAP >$@
 
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index d6a307fc5a..369b265ff7 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -24,4 +24,5 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
 nested.subdirs += src
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile
index afd9224056..8ba25db413 100644
--- a/src/libsystemd-network/Makefile
+++ b/src/libsystemd-network/Makefile
@@ -23,5 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-nested.subdirs += src test
+nested.subdirs += src
+nested.subdirs += test
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 5c26912ef1..23a2bddfee 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -118,6 +118,7 @@ $(DESTDIR)$(pkgincludedir)/%.h: $(srcdir)/include/systemd/%.h
 
 files.sys.all += $(addprefix $(pkgincludedir)/,$(notdir $(_pkginclude_HEADERS)))
 $(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym
+
 nested.subdirs += src
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile
index 10d3e668e8..dee853576d 100644
--- a/src/libsystemd/src/Makefile
+++ b/src/libsystemd/src/Makefile
@@ -198,6 +198,17 @@ sd.libsystemd_SOURCES =
 sd.libsystemd_SOURCES += $(patsubst src/libsystemd/%,%,$(filter %.c,$(_libsystemd_internal_la_SOURCES)))
 sd.libsystemd_SOURCES += $(addprefix sd-journal/,$(notdir $(filter %.c,$(_libsystemd_journal_internal_la_SOURCES))))
 $(outdir)/libsystemd-internal.la: $(addprefix $(outdir)/,$(sd.libsystemd_SOURCES:.c=.lo))
-nested.subdirs += $(sort $(dir $(sd.libsystemd_SOURCES)))
+
+nested.subdirs += sd-bus
+nested.subdirs += sd-daemon
+nested.subdirs += sd-device
+nested.subdirs += sd-event
+nested.subdirs += sd-hwdb
+nested.subdirs += sd-id128
+nested.subdirs += sd-journal
+nested.subdirs += sd-login
+nested.subdirs += sd-netlink
+nested.subdirs += sd-network
+nested.subdirs += sd-resolve
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk