Split up Makefile.am

3 files changed, 147 insertions, 89 deletions

diff --git a/.gitignore b/.gitignore
index 586b3796b1..8df3035987 100644
--- a/.gitignore
+++ b/.gitignore
@@ -295,3 +295,4 @@ config.log
 config.status
 configure
 stamp-*
+.tmp*
diff --git a/Makefile.am b/Makefile.am
index 3b7cc1e33e..3846a21ef9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,4 @@
+#@all
 #  -*- Mode: makefile; indent-tabs-mode: t -*-
 #
 #  This file is part of systemd.
@@ -6,6 +7,7 @@
 #  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
@@ -19,7 +21,7 @@
 #
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-
+#@common.once.head.mk
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 AM_MAKEFLAGS = --no-print-directory
 AUTOMAKE_OPTIONS = color-tests parallel-tests
@@ -38,10 +40,12 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
+#@src/libudev/Makefile
 LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
+#@src/libsystemd/Makefile
 LIBSYSTEMD_CURRENT=14
 LIBSYSTEMD_REVISION=0
 LIBSYSTEMD_AGE=14
@@ -64,6 +68,7 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=5
 LIBSYSTEMD_JOURNAL_AGE=11
 
+#@config.mk
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -115,6 +120,7 @@ rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
 rootlibexecdir=$(rootprefix)/lib/systemd
 
+#@discard.mk
 EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
@@ -393,6 +399,7 @@ bin_PROGRAMS = \
 	systemd-stdio-bridge \
 	systemd-path
 
+#@src/kernel-install/Makefile
 dist_bin_SCRIPTS = \
 	src/kernel-install/kernel-install
 
@@ -400,6 +407,7 @@ dist_kernelinstall_SCRIPTS = \
 	src/kernel-install/50-depmod.install \
 	src/kernel-install/90-loaderentry.install
 
+#@discard.mk
 rootlibexec_PROGRAMS = \
 	systemd \
 	systemd-cgroups-agent \
@@ -753,7 +761,7 @@ EXTRA_DIST += \
 	tools/xml_helper.py \
 	man/glib-event-glue.c
 
-# ------------------------------------------------------------------------------
+#@src/basic/Makefile -----------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libbasic.la
 
@@ -972,7 +980,7 @@ libbasic_la_LIBADD = \
 	-lrt \
 	-lm
 
-# -----------------------------------------------------------------------------
+#@src/shared/Makefile ---------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libshared.la
 
@@ -1104,7 +1112,7 @@ libfirewall_la_LIBADD = \
 	$(LIBIPTC_LIBS)
 endif
 
-# -----------------------------------------------------------------------------
+#@discard.mk ------------------------------------------------------------------
 if ENABLE_LDCONFIG
 dist_systemunit_DATA += \
 	units/ldconfig.service
@@ -1113,7 +1121,7 @@ SYSINIT_TARGET_WANTS += \
 	ldconfig.service
 endif
 
-# ------------------------------------------------------------------------------
+#@src/core/Makefile ------------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libcore.la
 
@@ -1260,6 +1268,7 @@ src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
+#@discard.mk
 gperf_gperf_m4_sources = \
 	src/core/load-fragment-gperf.gperf.m4
 
@@ -1296,7 +1305,7 @@ CLEANFILES += \
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@
 
-
+#@src/basic/Makefile
 src/basic/errno-list.txt:
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - </dev/null | $(AWK) '/^#define[ \t]+E[^ _]+[ \t]+/ { print $$2; }' >$@
@@ -1344,6 +1353,7 @@ src/basic/cap-from-name.h: src/basic/cap-from-name.gperf
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
+#@src/journal/Makefile
 audit_list_includes = -include linux/audit.h -include missing.h
 if HAVE_AUDIT
 audit_list_includes += -include libaudit.h
@@ -1370,7 +1380,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/core/Makefile ------------------------------------------------------------
 systemd_SOURCES = \
 	src/core/main.c
 
@@ -1406,7 +1416,7 @@ EXTRA_DIST += \
 	src/core/macros.systemd.in \
 	src/core/triggers.systemd.in
 
-# ------------------------------------------------------------------------------
+#@test/Makefile ----------------------------------------------------------------
 
 manual_tests += \
 	test-ns \
@@ -2230,7 +2240,7 @@ test_arphrd_list_SOURCES = \
 test_arphrd_list_LDADD = \
 	libbasic.la
 
-# ------------------------------------------------------------------------------
+#@discard.mk -------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
 .PHONY: coverage lcov-run lcov-report coverage-sync
 
@@ -2269,7 +2279,7 @@ lcov-run lcov-report:
 	echo "Need to reconfigure with --enable-coverage"
 endif
 
-# ------------------------------------------------------------------------------
+#@src/analyze/Makefile ---------------------------------------------------------
 systemd_analyze_SOURCES = \
 	src/analyze/analyze.c \
 	src/analyze/analyze-verify.c \
@@ -2283,14 +2293,14 @@ systemd_analyze_CFLAGS = \
 systemd_analyze_LDADD = \
 	libcore.la
 
-# ------------------------------------------------------------------------------
+#@src/initctl/Makefile ---------------------------------------------------------
 systemd_initctl_SOURCES = \
 	src/initctl/initctl.c
 
 systemd_initctl_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/update-utmp/Makefile -----------------------------------------------------
 systemd_update_utmp_SOURCES = \
 	src/update-utmp/update-utmp.c
 
@@ -2302,14 +2312,14 @@ systemd_update_utmp_LDADD = \
 	libshared.la \
 	$(AUDIT_LIBS)
 
-# ------------------------------------------------------------------------------
+#@src/update-done/Makefile -----------------------------------------------------
 systemd_update_done_SOURCES = \
 	src/update-done/update-done.c
 
 systemd_update_done_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/core/Makefile ------------------------------------------------------------
 systemd_shutdown_SOURCES = \
 	src/core/umount.c \
 	src/core/umount.h \
@@ -2322,7 +2332,7 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/modules-load/Makefile ----------------------------------------------------
 if HAVE_KMOD
 systemd_modules_load_SOURCES = \
 	src/modules-load/modules-load.c
@@ -2357,7 +2367,7 @@ EXTRA_DIST += \
 	units/systemd-modules-load.service.in \
 	units/kmod-static-nodes.service.in
 
-# ------------------------------------------------------------------------------
+#@src/tmpfiles/Makefile --------------------------------------------------------
 if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
 	src/tmpfiles/tmpfiles.c
@@ -2416,7 +2426,7 @@ EXTRA_DIST += \
 	units/systemd-tmpfiles-setup.service.in \
 	units/systemd-tmpfiles-clean.service.in
 
-# ------------------------------------------------------------------------------
+#@src/sysusers/Makefile --------------------------------------------------------
 if ENABLE_SYSUSERS
 systemd_sysusers_SOURCES = \
 	src/sysusers/sysusers.c
@@ -2452,7 +2462,7 @@ EXTRA_DIST += \
 	sysusers.d/systemd-remote.conf.m4 \
 	sysusers.d/basic.conf.in
 
-# ------------------------------------------------------------------------------
+#@discard.mk -------------------------------------------------------------------
 dist_factory_etc_DATA = \
 	factory/etc/nsswitch.conf
 
@@ -2462,7 +2472,7 @@ dist_factory_pam_DATA = \
 	factory/etc/pam.d/other
 endif
 
-# ------------------------------------------------------------------------------
+#@src/firstboot/Makefile -------------------------------------------------------
 if ENABLE_FIRSTBOOT
 systemd_firstboot_SOURCES = \
 	src/firstboot/firstboot.c
@@ -2484,7 +2494,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-firstboot.service.in
 
-# ------------------------------------------------------------------------------
+#@src/machine-id-setup/Makefile ------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
 	src/machine-id-setup/machine-id-setup-main.c \
 	src/core/machine-id-setup.c \
@@ -2496,35 +2506,35 @@ systemd_machine_id_setup_LDADD = \
 SYSINIT_TARGET_WANTS += \
 	systemd-machine-id-commit.service
 
-# ------------------------------------------------------------------------------
+#@src/sysctl/Makefile ----------------------------------------------------------
 systemd_sysctl_SOURCES = \
 	src/sysctl/sysctl.c
 
 systemd_sysctl_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/sleep/Makefile -----------------------------------------------------------
 systemd_sleep_SOURCES = \
 	src/sleep/sleep.c
 
 systemd_sleep_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/fsck/Makefile ------------------------------------------------------------
 systemd_fsck_SOURCES = \
 	src/fsck/fsck.c
 
 systemd_fsck_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/ac-power/Makefile --------------------------------------------------------
 systemd_ac_power_SOURCES = \
 	src/ac-power/ac-power.c
 
 systemd_ac_power_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/detect-virt/Makefile -----------------------------------------------------
 systemd_detect_virt_SOURCES = \
 	src/detect-virt/detect-virt.c
 
@@ -2534,28 +2544,28 @@ systemd_detect_virt_LDADD = \
 INSTALL_EXEC_HOOKS += \
 	systemd-detect-virt-install-hook
 
-# ------------------------------------------------------------------------------
+#@src/delta/Makefile -----------------------------------------------------------
 systemd_delta_SOURCES = \
 	src/delta/delta.c
 
 systemd_delta_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/getty-generator/Makefile -------------------------------------------------
 systemd_getty_generator_SOURCES = \
 	src/getty-generator/getty-generator.c
 
 systemd_getty_generator_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/debug-generator/Makefile -------------------------------------------------
 systemd_debug_generator_SOURCES = \
 	src/debug-generator/debug-generator.c
 
 systemd_debug_generator_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/fstab-generator/Makefile -------------------------------------------------
 systemd_fstab_generator_SOURCES = \
 	src/fstab-generator/fstab-generator.c \
 	src/core/mount-setup.c
@@ -2563,14 +2573,14 @@ systemd_fstab_generator_SOURCES = \
 systemd_fstab_generator_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/system-update-generator/Makefile -----------------------------------------
 systemd_system_update_generator_SOURCES = \
 	src/system-update-generator/system-update-generator.c
 
 systemd_system_update_generator_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/hibernate-resume/Makefile ------------------------------------------------
 if ENABLE_HIBERNATE
 systemgenerator_PROGRAMS += \
 	systemd-hibernate-resume-generator
@@ -2605,7 +2615,7 @@ EXTRA_DIST += \
 	units/systemd-hibernate-resume@.service.in \
 	units/systemd-hybrid-sleep.service.in
 
-# ------------------------------------------------------------------------------
+#@src/boot/Makefile ------------------------------------------------------------
 if ENABLE_EFI
 if HAVE_BLKID
 bootctl_SOURCES = \
@@ -2634,7 +2644,7 @@ dist_zshcompletion_data += \
 	shell-completion/zsh/_bootctl
 endif
 
-# ------------------------------------------------------------------------------
+#@discard.mk -------------------------------------------------------------------
 if HAVE_GNUEFI
 efi_cppflags = \
 	$(EFI_CPPFLAGS) \
@@ -2695,7 +2705,7 @@ endif
 endif
 endif
 
-# ------------------------------------------------------------------------------
+#@src/boot/efi/Makefile --------------------------------------------------------
 systemd_boot_headers = \
 	src/boot/efi/util.h \
 	src/boot/efi/console.h \
@@ -2798,7 +2808,7 @@ test-efi: test-efi-disk.img
 
 EXTRA_DIST += test/test-efi-create-disk.sh
 
-# ------------------------------------------------------------------------------
+#@src/gpt-auto-generator/Makefile ----------------------------------------------
 if HAVE_BLKID
 systemgenerator_PROGRAMS +=  \
 	systemd-gpt-auto-generator
@@ -2816,7 +2826,7 @@ systemd_gpt_auto_generator_CFLAGS = \
 	$(BLKID_CFLAGS)
 endif
 
-# ------------------------------------------------------------------------------
+#@src/dbus1-generator/Makefile -------------------------------------------------
 systemgenerator_PROGRAMS +=  \
 	systemd-dbus1-generator
 
@@ -2840,21 +2850,21 @@ dist_xinitrc_SCRIPTS = \
 INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
 UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
 
-# ------------------------------------------------------------------------------
+#@src/sysv-generator/Makefile --------------------------------------------------
 systemd_sysv_generator_SOURCES = \
 	src/sysv-generator/sysv-generator.c
 
 systemd_sysv_generator_LDADD = \
 	libcore.la
 
-# ------------------------------------------------------------------------------
+#@src/rc-local-generator/Makefile ----------------------------------------------
 systemd_rc_local_generator_SOURCES = \
 	src/rc-local-generator/rc-local-generator.c
 
 systemd_rc_local_generator_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/remount-fs/Makefile ------------------------------------------------------
 systemd_remount_fs_SOURCES = \
 	src/remount-fs/remount-fs.c \
 	src/core/mount-setup.c \
@@ -2863,70 +2873,70 @@ systemd_remount_fs_SOURCES = \
 systemd_remount_fs_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/cgroups-agent/Makefile ---------------------------------------------------
 systemd_cgroups_agent_SOURCES = \
 	src/cgroups-agent/cgroups-agent.c
 
 systemd_cgroups_agent_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/escape/Makefile ----------------------------------------------------------
 systemd_escape_SOURCES = \
 	src/escape/escape.c
 
 systemd_escape_LDADD = \
 	libshared.la
 
-# -----------------------------------------------------------------------------
+#@src/systemctl/Makefile ------------------------------------------------------
 systemctl_SOURCES = \
 	src/systemctl/systemctl.c
 
 systemctl_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/notify/Makefile ----------------------------------------------------------
 systemd_notify_SOURCES = \
 	src/notify/notify.c
 
 systemd_notify_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/path/Makefile ------------------------------------------------------------
 systemd_path_SOURCES = \
 	src/path/path.c
 
 systemd_path_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/ask-password/Makefile ----------------------------------------------------
 systemd_ask_password_SOURCES = \
 	src/ask-password/ask-password.c
 
 systemd_ask_password_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/reply-password/Makefile --------------------------------------------------
 systemd_reply_password_SOURCES = \
 	src/reply-password/reply-password.c
 
 systemd_reply_password_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/cgls/Makefile ------------------------------------------------------------
 systemd_cgls_SOURCES = \
 	src/cgls/cgls.c
 
 systemd_cgls_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/cgtop/Makefile -----------------------------------------------------------
 systemd_cgtop_SOURCES = \
 	src/cgtop/cgtop.c
 
 systemd_cgtop_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/nspawn/Makefile ----------------------------------------------------------
 systemd_nspawn_SOURCES = \
 	src/nspawn/nspawn.c \
 	src/nspawn/nspawn-settings.c \
@@ -2970,14 +2980,14 @@ systemd_nspawn_LDADD += \
 	libfirewall.la
 endif
 
-# ------------------------------------------------------------------------------
+#@src/run/Makefile -------------------------------------------------------------
 systemd_run_SOURCES = \
 	src/run/run.c
 
 systemd_run_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/bus-proxyd/Makefile ------------------------------------------------------
 noinst_LTLIBRARIES += \
 	libbus-proxy-core.la
 
@@ -3031,14 +3041,14 @@ bus-proxyd-set-cap-hook:
 INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
 endif
 
-# ------------------------------------------------------------------------------
+#@src/tty-ask-password-agent/Makefile ------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
 	src/tty-ask-password-agent/tty-ask-password-agent.c
 
 systemd_tty_ask_password_agent_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/libsystemd/Makefile ------------------------------------------------------
 libsystemd_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
@@ -3354,7 +3364,7 @@ busctl_SOURCES = \
 busctl_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/libsystemd-network/Makefile ----------------------------------------------
 noinst_LTLIBRARIES += \
 	libsystemd-network.la
 
@@ -3509,7 +3519,7 @@ tests += \
 	test-dhcp6-client \
 	test-lldp
 
-# ------------------------------------------------------------------------------
+#@src/libudev/Makefile ---------------------------------------------------------
 include_HEADERS += \
 	src/libudev/libudev.h
 
@@ -3561,7 +3571,7 @@ noinst_LTLIBRARIES += \
 libudev_internal_la_SOURCES =\
 	$(libudev_la_SOURCES)
 
-# ------------------------------------------------------------------------------
+#@src/udev/Makefile ------------------------------------------------------------
 INSTALL_DIRS += \
 	$(sysconfdir)/udev/rules.d
 
@@ -3823,7 +3833,7 @@ EXTRA_DIST += \
 	test/sysv-generator-test.py \
 	test/mocks/fsck
 
-# ------------------------------------------------------------------------------
+#@src/udev/ata_id/Makefile -----------------------------------------------------
 ata_id_SOURCES = \
 	src/udev/ata_id/ata_id.c
 
@@ -3833,7 +3843,7 @@ ata_id_LDADD = \
 udevlibexec_PROGRAMS += \
 	ata_id
 
-# ------------------------------------------------------------------------------
+#@src/udev/cdrom_id/Makefile ---------------------------------------------------
 cdrom_id_SOURCES = \
 	src/udev/cdrom_id/cdrom_id.c
 
@@ -3846,7 +3856,7 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
 	rules/60-cdrom_id.rules
 
-# ------------------------------------------------------------------------------
+#@src/udev/collect/Makefile ----------------------------------------------------
 collect_SOURCES = \
 	src/udev/collect/collect.c
 
@@ -3856,7 +3866,7 @@ collect_LDADD = \
 udevlibexec_PROGRAMS += \
 	collect
 
-# ------------------------------------------------------------------------------
+#@src/udev/scsi_id/Makefile ----------------------------------------------------
 scsi_id_SOURCES =\
 	src/udev/scsi_id/scsi_id.c \
 	src/udev/scsi_id/scsi_serial.c \
@@ -3872,7 +3882,7 @@ udevlibexec_PROGRAMS += \
 EXTRA_DIST += \
 	src/udev/scsi_id/README
 
-# ------------------------------------------------------------------------------
+#@src/udev/v4l_id/Makefile -----------------------------------------------------
 v4l_id_SOURCES = \
 	src/udev/v4l_id/v4l_id.c
 
@@ -3885,7 +3895,7 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
 	rules/60-persistent-v4l.rules
 
-# ------------------------------------------------------------------------------
+#@src/udev/mtd_probe/Makefile --------------------------------------------------
 mtd_probe_SOURCES =  \
 	src/udev/mtd_probe/mtd_probe.c \
 	src/udev/mtd_probe/mtd_probe.h \
@@ -3897,7 +3907,7 @@ dist_udevrules_DATA += \
 udevlibexec_PROGRAMS += \
 	mtd_probe
 
-# ------------------------------------------------------------------------------
+#@src/test/Makefile ------------------------------------------------------------
 test_id128_SOURCES = \
 	src/test/test-id128.c
 
@@ -3907,7 +3917,7 @@ test_id128_LDADD = \
 tests += \
 	test-id128
 
-# ------------------------------------------------------------------------------
+#@src/activate/Makefile --------------------------------------------------------
 
 rootlibexec_PROGRAMS += \
 	systemd-activate
@@ -3918,7 +3928,7 @@ systemd_activate_SOURCES = \
 systemd_activate_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/journal/Makefile ---------------------------------------------------------
 systemd_journald_SOURCES = \
 	src/journal/journald.c \
 	src/journal/journald-server.h
@@ -3933,6 +3943,7 @@ systemd_cat_SOURCES = \
 systemd_cat_LDADD = \
 	libjournal-core.la
 
+#@src/journal-remote/Makefile
 if HAVE_MICROHTTPD
 rootlibexec_PROGRAMS += \
 	systemd-journal-remote
@@ -4020,6 +4031,7 @@ EXTRA_DIST += \
 	units/systemd-journal-upload.service.in \
 	src/journal-remote/journal-upload.conf.in
 
+#@src/journal/Makefile
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
 	$(AM_CFLAGS)
@@ -4386,7 +4398,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-journal-gatewayd.service.in
 
-# ------------------------------------------------------------------------------
+#@src/socket-proxy/Makefile ----------------------------------------------------
 
 systemd_socket_proxyd_SOURCES = \
 	src/socket-proxy/socket-proxyd.c
@@ -4394,7 +4406,7 @@ systemd_socket_proxyd_SOURCES = \
 systemd_socket_proxyd_LDADD = \
 	libshared.la
 
-# ------------------------------------------------------------------------------
+#@src/coredump/Makefile --------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
 	src/coredump/coredump.c \
@@ -4465,7 +4477,7 @@ EXTRA_DIST += \
 	sysctl.d/50-coredump.conf.in \
 	units/systemd-coredump@.service.in
 
-# ------------------------------------------------------------------------------
+#@src/binfmt/Makefile ----------------------------------------------------------
 if ENABLE_BINFMT
 systemd_binfmt_SOURCES = \
 	src/binfmt/binfmt.c
@@ -4496,7 +4508,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-binfmt.service.in
 
-# ------------------------------------------------------------------------------
+#@src/vconsole/Makefile --------------------------------------------------------
 if ENABLE_VCONSOLE
 systemd_vconsole_setup_SOURCES = \
 	src/vconsole/vconsole-setup.c
@@ -4521,7 +4533,7 @@ EXTRA_DIST += \
 	src/vconsole/90-vconsole.rules.in \
 	units/systemd-vconsole-setup.service.in
 
-# ------------------------------------------------------------------------------
+#@src/bootchart/Makefile -------------------------------------------------------
 if ENABLE_BOOTCHART
 systemd_bootchart_SOURCES = \
 	src/bootchart/bootchart.c \
@@ -4547,7 +4559,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-bootchart.service.in
 
-# ------------------------------------------------------------------------------
+#@src/quotacheck/Makefile ------------------------------------------------------
 if ENABLE_QUOTACHECK
 rootlibexec_PROGRAMS += \
 	systemd-quotacheck
@@ -4568,7 +4580,7 @@ EXTRA_DIST += \
 nodist_systemunit_DATA += \
 	units/quotaon.service
 
-# ------------------------------------------------------------------------------
+#@src/random-seed/Makefile -----------------------------------------------------
 if ENABLE_RANDOMSEED
 rootlibexec_PROGRAMS += \
 	systemd-random-seed
@@ -4590,7 +4602,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-random-seed.service.in
 
-# ------------------------------------------------------------------------------
+#@src/backlight/Makefile -------------------------------------------------------
 if ENABLE_BACKLIGHT
 rootlibexec_PROGRAMS += \
 	systemd-backlight
@@ -4608,7 +4620,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-backlight@.service.in
 
-# ------------------------------------------------------------------------------
+#@src/rfkill/Makefile ----------------------------------------------------------
 if ENABLE_RFKILL
 rootlibexec_PROGRAMS += \
 	systemd-rfkill
@@ -4629,7 +4641,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-rfkill.service.in
 
-# ------------------------------------------------------------------------------
+#@src/cryptsetup/Makefile ------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
 	systemd-cryptsetup
@@ -4663,7 +4675,7 @@ SYSINIT_TARGET_WANTS += \
 
 endif
 
-# ------------------------------------------------------------------------------
+#@src/hostname/Makefile --------------------------------------------------------
 if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
 	src/hostname/hostnamed.c
@@ -4717,14 +4729,14 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-hostnamed.service.in
 
-# ------------------------------------------------------------------------------
+#@src/core/Makefile.mk ---------------------------------------------------------
 dist_systemunit_DATA_busnames += \
 	units/org.freedesktop.systemd1.busname
 
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.systemd1.busname
 
-# ------------------------------------------------------------------------------
+#@src/locale/Makefile ----------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
 	src/locale/localed.c
@@ -4789,7 +4801,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-localed.service.in
 
-# ------------------------------------------------------------------------------
+#@src/timedate/Makefile --------------------------------------------------------
 if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
 	src/timedate/timedated.c
@@ -4843,7 +4855,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-timedated.service.in
 
-# ------------------------------------------------------------------------------
+#@src/timesync/Makefile --------------------------------------------------------
 if ENABLE_TIMESYNCD
 systemd_timesyncd_SOURCES = \
 	src/timesync/timesyncd.c \
@@ -4882,7 +4894,7 @@ EXTRA_DIST += \
 	units/systemd-timesyncd.service.in \
 	src/timesync/timesyncd.conf.in
 
-# ------------------------------------------------------------------------------
+#@src/nss-myhostname/Makefile --------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
 	src/nss-myhostname/nss-myhostname.sym \
@@ -4904,7 +4916,7 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
-# ------------------------------------------------------------------------------
+#@src/machine/Makefile ---------------------------------------------------------
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
 	src/machine/machined.c \
@@ -5007,7 +5019,7 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-machined.service.in
 
-# ------------------------------------------------------------------------------
+#@src/import/Makefile ----------------------------------------------------------
 if ENABLE_IMPORTD
 
 if HAVE_LIBCURL
@@ -5173,7 +5185,7 @@ EXTRA_DIST += \
 	units/systemd-importd.service.in
 
 
-# ------------------------------------------------------------------------------
+#@src/resolve/Makefile ---------------------------------------------------------
 if ENABLE_RESOLVED
 
 systemd_resolved_SOURCES = \
@@ -5356,7 +5368,7 @@ EXTRA_DIST += \
 	units/systemd-resolved.service.m4.in \
 	src/resolve/resolved.conf.in
 
-# ------------------------------------------------------------------------------
+#@src/network/Makefile ---------------------------------------------------------
 if ENABLE_NETWORKD
 rootlibexec_PROGRAMS += \
 	systemd-networkd
@@ -5531,7 +5543,7 @@ EXTRA_DIST += \
 	units/systemd-networkd-wait-online.service.in \
 	test/networkd-test.py
 
-# ------------------------------------------------------------------------------
+#@src/login/Makefile -----------------------------------------------------------
 if ENABLE_LOGIND
 systemd_logind_SOURCES = \
 	src/login/logind.c \
@@ -5749,7 +5761,7 @@ endif
 EXTRA_DIST += \
 	units/systemd-user-sessions.service.in
 
-# ------------------------------------------------------------------------------
+#@discard.mk -------------------------------------------------------------------
 EXTRA_DIST += \
 	test/Makefile \
 	test/README.testsuite \
@@ -5787,7 +5799,7 @@ EXTRA_DIST += \
 	test/loopy.service.d \
 	test/loopy.service.d/compat.conf
 
-# ------------------------------------------------------------------------------
+#@src/compat-libs/Makefile -----------------------------------------------------
 if ENABLE_COMPAT_LIBS
 libsystemd-%.c: src/compat-libs/libsystemd-%.sym
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -5908,7 +5920,7 @@ EXTRA_DIST += \
 	src/compat-libs/libsystemd-id128.pc.in \
 	src/compat-libs/libsystemd-daemon.pc.in
 
-# ------------------------------------------------------------------------------
+#@discard.mk -------------------------------------------------------------------
 substitutions = \
        '|rootlibexecdir=$(rootlibexecdir)|' \
        '|rootbindir=$(rootbindir)|' \
@@ -6275,6 +6287,7 @@ dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
 	        exit 1;                                                        \
             fi; done
 
+#@hwdb/Makefile
 .PHONY: hwdb-update
 hwdb-update:
 	( cd $(top_srcdir)/hwdb && \
@@ -6285,6 +6298,7 @@ hwdb-update:
 	wget -O ma-small.txt 'http://standards.ieee.org/develop/regauth/oui36/oui36.txt' && \
 	./ids-update.pl )
 
+#@Makefile
 .PHONY: built-sources
 built-sources: $(BUILT_SOURCES)
 
@@ -6308,6 +6322,7 @@ install-tree: all
 	$(MAKE) install DESTDIR=$(abs_srcdir)/install-tree
 	tree $(abs_srcdir)/install-tree
 
+#@common.once.tail.mk
 # Let's run all tests of the test suite, but under valgrind. Let's
 # exclude perl/python/shell scripts we have in there
 .PHONY: valgrind-tests
@@ -6360,6 +6375,7 @@ check-includes: $(top_srcdir)/tools/check-includes.pl
 EXTRA_DIST += \
 	$(top_srcdir)/tools/check-includes.pl
 
+#@common.once.head.mk
 # Stupid test that everything purported to be exported really is
 define generate-sym-test
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -6372,6 +6388,7 @@ define generate-sym-test
 	$(AM_V_at)printf 'return 0; }\n' >> $@
 endef
 
+#@src/libsystemd/Makefile
 test-libsystemd-sym.c: \
 		$(top_builddir)/src/libsystemd/libsystemd.sym \
 		src/systemd/sd-journal.h \
@@ -6384,16 +6401,19 @@ test-libsystemd-sym.c: \
 		src/systemd/sd-event.h
 	$(generate-sym-test)
 
+#@src/libudev/Makefile
 test-libudev-sym.c: \
 		src/libudev/libudev.sym \
 		src/udev/udev.h
 	$(generate-sym-test)
 
+#@src/libsystemd/Makefile
 nodist_test_libsystemd_sym_SOURCES = \
 	test-libsystemd-sym.c
 test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
+#@src/libudev/Makefile
 nodist_test_libudev_sym_SOURCES = \
 	test-libudev-sym.c
 test_libudev_sym_CFLAGS = \
@@ -6402,6 +6422,7 @@ test_libudev_sym_CFLAGS = \
 test_libudev_sym_LDADD = \
 	libudev.la
 
+#@discard.mk
 BUILT_SOURCES += \
 	test-libsystemd-sym.c \
 	test-libudev-sym.c
@@ -6414,6 +6435,7 @@ tests += \
 	test-libsystemd-sym \
 	test-libudev-sym
 
+#@common.once.tail.mk
 .PHONY: cppcheck
 cppcheck:
 	cppcheck --enable=all -q $(top_srcdir)
diff --git a/move.sh b/move.sh
new file mode 100755
index 0000000000..0312b2d36f
--- /dev/null
+++ b/move.sh
@@ -0,0 +1,35 @@
+#!/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
+}
+
+(
+        set -e
+        find . \( -name Makefile -o -name '*.mk' \) -delete
+
+        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 < Makefile.am
+        rm .tmp.move.all
+)