at: am: clean up and document

3 files changed, 74 insertions, 83 deletions

diff --git a/build-aux/Makefile.each.tail/60-am.mk b/build-aux/Makefile.each.tail/60-am.mk
index 302fccc091..38ebc10ea9 100644
--- a/build-aux/Makefile.each.tail/60-am.mk
+++ b/build-aux/Makefile.each.tail/60-am.mk
@@ -1,83 +1,6 @@
-mod.am.depends += files
-
-rootbin_PROGRAMS ?=
-bin_PROGRAMS ?=
-dist_bin_SCRIPTS ?=
-bashcompletion_DATA ?=
-zshcompletion_DATA ?=
-dist_bashcompletion_DATA := $(sort $(bashcompletion_DATA) $(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS))
-dist_zshcompletion_DATA := $(sort $(zshcompletion_DATA) $(addprefix _,$(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS)))
-
-man_MANS ?=
-_am.man_MANS := $(man_MANS)
-undefine man_MANS
-man0_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .0,$(suffix $(_am.tmp))),$(_am.tmp)))
-man1_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .1,$(suffix $(_am.tmp))),$(_am.tmp)))
-man2_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .2,$(suffix $(_am.tmp))),$(_am.tmp)))
-man3_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .3,$(suffix $(_am.tmp))),$(_am.tmp)))
-man4_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .4,$(suffix $(_am.tmp))),$(_am.tmp)))
-man5_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .5,$(suffix $(_am.tmp))),$(_am.tmp)))
-man6_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .6,$(suffix $(_am.tmp))),$(_am.tmp)))
-man7_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .7,$(suffix $(_am.tmp))),$(_am.tmp)))
-man8_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .8,$(suffix $(_am.tmp))),$(_am.tmp)))
-man9_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .9,$(suffix $(_am.tmp))),$(_am.tmp)))
-manl_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .l,$(suffix $(_am.tmp))),$(_am.tmp)))
-mann_MANS += $(foreach _am.tmp,$(_am.man_MANS),$(if $(findstring .n,$(suffix $(_am.tmp))),$(_am.tmp)))
-
-$(eval \
-  $(foreach p,$(am.primaries)  ,$(call _am.per_primary,$p)$(at.nl)))
-$(eval \
-  $(foreach f,$(am.out_PROGRAMS)   ,$(call _am.per_PROGRAM,$f,$(call am.file2var,$f))$(at.nl))\
-  $(foreach f,$(am.out_LTLIBRARIES),$(call _am.per_LTLIBRARY,$f,$(call am.file2var,$f))$(at.nl))\
-  $(foreach d,$(am.sys2dirs)  ,$(call _am.per_directory,$d)$(at.nl)))
-
-$(DESTDIR)$(includedir)/%.h: $(srcdir)/include/%.h
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-
-$(DESTDIR)$(sysusersdir)/%.conf: $(srcdir)/%.sysusers
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-$(DESTDIR)$(sysusersdir)/%.conf: $(outdir)/%.sysusers
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-
-$(DESTDIR)$(sysctldir)/%.conf: $(srcdir)/%.sysctl
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-$(DESTDIR)$(sysctldir)/%.conf: $(outdir)/%.sysctl
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-
-$(DESTDIR)$(tmpfilesdir)/%.conf: $(srcdir)/%.tmpfiles
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-$(DESTDIR)$(tmpfilesdir)/%.conf: $(outdir)/%.tmpfiles
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-
-$(DESTDIR)$(pamconfdir)/%: $(srcdir)/%.pam
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-$(DESTDIR)$(pamconfdir)/%: $(outdir)/%.pam
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-
-$(DESTDIR)$(bashcompletiondir)/%: $(srcdir)/%.completion.bash
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-$(DESTDIR)$(bashcompletiondir)/%: $(outdir)/%.completion.bash
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-
-$(DESTDIR)$(zshcompletiondir)/_%: $(srcdir)/%.completion.zsh
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-$(DESTDIR)$(zshcompletiondir)/_%: $(outdir)/%.completion.zsh
-	@$(NORMAL_INSTALL)
-	$(am.INSTALL)
-
-at.subdirs += $(am.subdirs)
-files.sys.all += $(foreach p,$(am.primaries),$(am.sys_$p))
-files.out.all += $(foreach p,$(am.primaries),$(am.out_$p))
-files.out.check += $(foreach p,$(am.primaries),$(am.check_$p))
+$(eval $(value _am.pass0))
+$(eval $(value _am.pass1))
+$(eval $(value _am.pass2))
+$(eval $(value _am.pass3))
+$(eval $(value _am.pass4))
+$(eval $(value _am.pass5))
diff --git a/build-aux/Makefile.each.tail/60-amcfg.mk b/build-aux/Makefile.each.tail/60-amcfg.mk
new file mode 100644
index 0000000000..f86bdf4998
--- /dev/null
+++ b/build-aux/Makefile.each.tail/60-amcfg.mk
@@ -0,0 +1,45 @@
+$(DESTDIR)$(includedir)/%.h: $(srcdir)/include/%.h
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+
+$(DESTDIR)$(sysusersdir)/%.conf: $(srcdir)/%.sysusers
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+$(DESTDIR)$(sysusersdir)/%.conf: $(outdir)/%.sysusers
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+
+$(DESTDIR)$(sysctldir)/%.conf: $(srcdir)/%.sysctl
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+$(DESTDIR)$(sysctldir)/%.conf: $(outdir)/%.sysctl
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+
+$(DESTDIR)$(tmpfilesdir)/%.conf: $(srcdir)/%.tmpfiles
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+$(DESTDIR)$(tmpfilesdir)/%.conf: $(outdir)/%.tmpfiles
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+
+$(DESTDIR)$(pamconfdir)/%: $(srcdir)/%.pam
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+$(DESTDIR)$(pamconfdir)/%: $(outdir)/%.pam
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+
+$(DESTDIR)$(bashcompletiondir)/%: $(srcdir)/%.completion.bash
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+$(DESTDIR)$(bashcompletiondir)/%: $(outdir)/%.completion.bash
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+
+$(DESTDIR)$(zshcompletiondir)/_%: $(srcdir)/%.completion.zsh
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
+$(DESTDIR)$(zshcompletiondir)/_%: $(outdir)/%.completion.zsh
+	@$(NORMAL_INSTALL)
+	$(am.INSTALL)
diff --git a/build-aux/Makefile.each.tail/70-sdcompletion.mk b/build-aux/Makefile.each.tail/70-sdcompletion.mk
new file mode 100644
index 0000000000..22a0d1be62
--- /dev/null
+++ b/build-aux/Makefile.each.tail/70-sdcompletion.mk
@@ -0,0 +1,23 @@
+mod.sdcompletion.description = (systemd) shell completion
+mod.sdcompletion.depends += am
+define mod.sdcompletion.doc
+# Inputs:
+#   - Directory variable : `rootbin_PROGRAMS`
+#   - Directory variable : `bin_PROGRAMS`
+#   - Directory variable : `dist_bin_SCRIPTS`
+#   - Directory variable : `bashcompletion_DATA`
+#   - Directory variable : `zshcompletion_DATA`
+# Outputs:
+#   - Directory variable : `dist_bashcompletion_DATA`
+#   - Directory variable : `dist_zshcompletion_DATA`
+endef
+mod.sdcompletion.doc := $(value mod.sdcompletion.doc)
+
+rootbin_PROGRAMS ?=
+bin_PROGRAMS ?=
+dist_bin_SCRIPTS ?=
+bashcompletion_DATA ?=
+zshcompletion_DATA ?=
+# We use `dist_` to trick `am` into not putting it in `am.out_DATA`
+dist_bashcompletion_DATA := $(sort $(bashcompletion_DATA) $(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS))
+dist_zshcompletion_DATA := $(sort $(zshcompletion_DATA) $(addprefix _,$(rootbin_PROGRAMS) $(bin_PROGRAMS) $(dist_bin_SCRIPTS)))