more

3 files changed, 47 insertions, 23 deletions

diff --git a/build-aux/Makefile.each.tail/00-mod.mk b/build-aux/Makefile.each.tail/00-mod.mk
index 6346173b8c..dc1a2fe07c 100644
--- a/build-aux/Makefile.each.tail/00-mod.mk
+++ b/build-aux/Makefile.each.tail/00-mod.mk
@@ -13,27 +13,27 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-$(outdir)/at-variables $(outdir)/at-variables-local: _mod.VARIABLES := $(filter-out $(call _mod.quote-pattern,$(_at.VARIABLES)),$(.VARIABLES))
+$(outdir)/at-variables $(outdir)/at-variables-local: _mod.VARIABLES := $(filter-out $(call quote.pattern,$(_at.VARIABLES)),$(.VARIABLES))
 $(outdir)/at-variables-global:
-	@printf '%s\n' $(call _mod.quote-shell-each,$(sort $(.VARIABLES)))
+	@printf '%s\n' $(call quote.shell-each,$(sort $(.VARIABLES)))
 $(outdir)/at-variables-local:
-	@printf '%s\n' $(call _mod.quote-shell-each,$(sort $(_mod.VARIABLES)))
+	@printf '%s\n' $(call quote.shell-each,$(sort $(_mod.VARIABLES)))
 $(outdir)/at-variables $(outdir)/at-values:
-	@printf '%s\n' $(call _mod.quote-shell-each,$(sort $(.VARIABLES),$(_mod.VARIABLES)))
+	@printf '%s\n' $(call quote.shell-each,$(sort $(.VARIABLES),$(_mod.VARIABLES)))
 $(outdir)/at-variables/%:
-	@printf '%s\n' $(call _mod.quote-shell,$($*))
+	@printf '%s\n' $(call quote.shell,$($*))
 $(outdir)/at-values/%:
-	@printf '%s\n' $(call _mod.quote-shell,$(value $*))
+	@printf '%s\n' $(call quote.shell,$(value $*))
 .PHONY:       $(addprefix $(outdir)/, at-variables-global at-variables-local at-variables at-values)
 at.targets += $(addprefix $(outdir)/, at-variables-global at-variables-local at-variables at-values at-variables/% at-values/%)
 
 $(outdir)/at-modules:
 	@printf 'Autothing modules used in this project:\n'
-	@printf ' - %s\n' $(foreach _mod.tmp,$(_mod.modules),$(call _mod.quote-shell,$(_mod.tmp)	$(mod.$(_mod.tmp).description)))|column -t -s $$'\t'
+	@printf ' - %s\n' $(foreach _mod.tmp,$(_mod.modules),$(call quote.shell,$(_mod.tmp)	$(mod.$(_mod.tmp).description)))|column -t -s $$'\t'
 $(addprefix $(outdir)/at-modules/,$(_mod.modules)): $(outdir)/at-modules/%:
-	@printf 'Name           : %s\n' $(call _mod.quote-shell,$*)
-	@printf 'Description    : %s\n' $(call _mod.quote-shell,$(mod.$*.description))
-	@echo   'Contains Files :' $(call _mod.quote-shell-each,$(call at.relto,$(topsrcdir),$(sort $(mod.$*.files) $(wildcard $(topsrcdir)/build-aux/Makefile.*/??-$*.mk))))
+	@printf 'Name           : %s\n' $(call quote.shell,$*)
+	@printf 'Description    : %s\n' $(call quote.shell,$(mod.$*.description))
+	@echo   'Contains Files :' $(call quote.shell-each,$(call at.relto,$(topsrcdir),$(sort $(mod.$*.files) $(wildcard $(topsrcdir)/build-aux/Makefile.*/??-$*.mk))))
 	@echo   'Depends on     :' $(mod.$*.depends)
 
 $(outdir)/at-noop:
diff --git a/build-aux/Makefile.each.tail/50-sd.mk b/build-aux/Makefile.each.tail/50-sd.mk
index 511ce35be8..35b9168570 100644
--- a/build-aux/Makefile.each.tail/50-sd.mk
+++ b/build-aux/Makefile.each.tail/50-sd.mk
@@ -41,11 +41,12 @@ $(outdir)/$(DEPDIR):
 	$(AM_V_at)$(MKDIR_P) $@
 
 $(outdir)/%.la:
-	@if test $(words $(lt.link_files)) = 0; then echo 'Cannot link library with no dependencies: $@' >&2; exit 1; fi
-	$(AM_V_CCLD)$(sd.LINK) $(if $(lt.rpath),-rpath $(lt.rpath)) $(lt.link_files)
-$(addprefix $(outdir)/,$(am.PROGRAMS)): $(outdir)/%:
-	@if test $(words $(lt.link_files)) = 0; then echo 'Cannot link executable with no dependencies: $@' >&2; exit 1; fi
-	$(AM_V_CCLD)$(sd.LINK) $(lt.link_files)
+	@if test $(words $(lt.lib.files.all)) = 0; then echo 'Cannot link library with no dependencies: $@' >&2; exit 1; fi
+	$(AM_V_CCLD)$(sd.LINK) $(if $(lt.lib.rpath),-rpath $(lt.lib.rpath)) $(lt.lib.files.ld)
+	$(AM_V_at)$(lt.lib.post)
+$(addprefix $(outdir)/,$(am.out_PROGRAMS)): $(outdir)/%:
+	@if test $(words $(lt.exe.files.all)) = 0; then echo 'Cannot link executable with no dependencies: $@' >&2; exit 1; fi
+	$(AM_V_CCLD)$(sd.LINK) $(lt.exe.files.ld)
 
 # Stupid test that everything purported to be exported really is
 $(outdir)/test-lib%-sym.c: $(srcdir)/lib%.sym
@@ -67,6 +68,10 @@ $(outdir)/%-from-name.gperf: $(outdir)/%-list.txt
 $(outdir)/%-from-name.h: $(outdir)/%-from-name.gperf
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_$(notdir $*) -H hash_$(notdir $*)_name -p -C <$< >$@
 
+ifeq ($(sd.sed_files),)
+EXTRA_DIST ?=
+sd.sed_files += $(notdir $(patsubst %.in,%,$(filter %.in,$(EXTRA_DIST))))
+endif
 ifneq ($(sd.sed_files),)
 $(addprefix $(outdir)/,$(sd.sed_files)): $(outdir)/%: $(srcdir)/%.in
 	$(sd.SED_PROCESS)
@@ -83,3 +88,5 @@ $(outdir)/%.c: $(outdir)/%.gperf
 
 $(outdir)/%: $(srcdir)/%.m4 $(top_builddir)/config.status
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
+$(outdir)/%: $(outdir)/%.m4 $(top_builddir)/config.status
+	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
diff --git a/build-aux/Makefile.each.tail/60-am.mk b/build-aux/Makefile.each.tail/60-am.mk
index 1a59397a25..7e9b8f3800 100644
--- a/build-aux/Makefile.each.tail/60-am.mk
+++ b/build-aux/Makefile.each.tail/60-am.mk
@@ -4,37 +4,55 @@ bin_PROGRAMS ?=
 bin_SCRIPTS ?=
 bashcompletion_DATA ?=
 zshcompletion_DATA ?=
-bashcompletion_DATA := $(sort $(bashcompletion_DATA) $(bin_PROGRAMS) $(bin_SCRIPTS))
-zshcompletion_DATA := $(sort $(zshcompletion_DATA) $(addprefix _,$(bin_PROGRAMS) $(bin_SCRIPTS)))
+dist_bashcompletion_DATA := $(sort $(bashcompletion_DATA) $(bin_PROGRAMS) $(bin_SCRIPTS))
+dist_zshcompletion_DATA := $(sort $(zshcompletion_DATA) $(addprefix _,$(bin_PROGRAMS) $(bin_SCRIPTS)))
 
 $(eval \
   $(foreach p,$(am.primaries)  ,$(call _am.per_primary,$p)$(at.nl)))
 $(eval \
-  $(foreach f,$(am.PROGRAMS)   ,$(call _am.per_PROGRAM,$f,$(call am.file2var,$f))$(at.nl))\
-  $(foreach f,$(am.LTLIBRARIES),$(call _am.per_LTLIBRARY,$f,$(call am.file2var,$f))$(at.nl))\
-  $(foreach d,$(am.inst2dirs)  ,$(call _am.per_directory,$d)$(at.nl)))
+  $(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)
@@ -43,7 +61,6 @@ $(DESTDIR)$(zshcompletiondir)/_%: $(outdir)/%.completion.zsh
 	$(am.INSTALL)
 
 at.subdirs += $(am.subdirs)
-files.sys.all += $(foreach p,$(am.primaries),$(am.inst_$p))
-files.out.all += $(foreach p,$(am.primaries),$(am.noinst_$p))
-files.out.all += $(foreach p,$(am.primaries),$(call am.inst2noinst_$p,$(am.inst_$p)))
+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))