build: adapt the per-subdir Makefile.inc files

So that they can correctly implement the Automake-NG build system.
This has been done with the help of the diffs between the old top-level
Makefile.am files from mainline Automake (master branch) and Automake-NG
(ng/master branch), obtained with the command:

    diff -u Makefile.old Makefile.sav > diffs

* Makefile.am: Adjust.
* bin/Makefile.inc: Likewise.
* contrib/t/Makefile.inc: Likewise.
* doc/Makefile.inc: Likewise.
* lib/Automake/Makefile.inc: Likewise.
* lib/Makefile.inc: Likewise.
* lib/am/Makefile.inc: Likewise.
* m4/Makefile.inc: Likewise.
* t/Makefile.inc: Likewise.
* contrib/t/local.am: Delete.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

10 files changed, 156 insertions, 191 deletions

diff --git a/Makefile.am b/Makefile.am
index 143308a11..1d55b8a02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,32 +32,26 @@ nodist_noinst_SCRIPTS =
 ##  Top level.  ##
 ## ------------ ##
 
+# Distribution formats.
+AM_DIST_FORMATS = gzip xz
+
 EXTRA_DIST += \
   bootstrap.sh \
   GNUmakefile \
   HACKING \
-  PLANS
+  NG-NEWS \
+  PLANS \
+  $(gitlog_to_changelog_fixes)
 
 # We want a handful of substitutions to be fully-expanded by make;
 # then use config.status to substitute the remainder where a single
 # expansion is sufficient.  We use a funny notation here to avoid
 # configure substitutions in our text.
-do_subst = ( sed \
-  -e "s,[@]configure_input[@],Generated from $$in; do not edit by hand.,g" \
-  -e 's,[@]datadir[@],$(datadir),g' \
-  -e 's,[@]amdir[@],$(amdir),g' \
-  -e 's,[@]bindir[@],$(bindir),g' \
-  -e 's,[@]docdir[@],$(docdir),g' \
-  -e 's,[@]pkgvdatadir[@],$(pkgvdatadir),g' \
-  -e 's,[@]scriptdir[@],$(scriptdir),g' \
-  -e 's,[@]automake_acdir[@],$(automake_acdir),g' \
-  -e 's,[@]system_acdir[@],$(system_acdir),g' \
-## Hack to avoid a spurious substitution in the Automake script (part 1).
-  -e 's,[@]am__isrc[@],!!@!!am__isrc!!@!!,g' \
-  | $(SHELL) ./config.status --file=- \
-## Hack to avoid a spurious substitution in the Automake script (part 2).
-  | sed -e 's,!!@!!am__isrc!!@!!,@''am__isrc@,g' \
-  )
+do_subst = sed $(strip \
+  $(foreach x, data am bin doc pkgvdata script automake_ac system_ac, \
+              -e 's,@$(x)dir@,$($(x)dir),g')) \
+  -e "s,[@]configure_input@,Generated from $(<F) do not edit by hand.,g" \
+  <"$<" | $(SHELL) ./config.status --file=- >"$@-t"
 
 # Generated  files shouldn't contain unexpanded '@substitutions@', and
 # should be made read-only, to prevent them from being edited by mistake
@@ -93,26 +87,12 @@ ChangeLog:
 # Third-party, obsolescent or experimental stuff.
 EXTRA_DIST += \
   contrib/check-html.am \
-  contrib/multilib/README \
-  contrib/multilib/config-ml.in \
-  contrib/multilib/symlink-tree \
-  contrib/multilib/multilib.am \
-  contrib/multilib/multi.m4 \
   contrib/README
 
 # Older files, kept mostly for historical interest.
 EXTRA_DIST += \
-  old/ChangeLog-tests \
-  old/ChangeLog.96 \
-  old/ChangeLog.98 \
-  old/ChangeLog.00 \
-  old/ChangeLog.01 \
-  old/ChangeLog.02 \
-  old/ChangeLog.03 \
-  old/ChangeLog.04 \
-  old/ChangeLog.09 \
-  old/ChangeLog.11 \
-  old/TODO
+  $(addprefix old/ChangeLog., 96 98 00 01 02 03 04 09 11) \
+  old/ChangeLog-tests old/TODO
 
 # Maintainer-specific files and scripts.
 EXTRA_DIST += \
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index 280fff002..595882978 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -51,13 +51,11 @@ uninstall-hook:
 	done
 
 # These files depend on Makefile so they are rebuilt if $(VERSION),
-# $(datadir) or other do_subst'ituted variables change.
-%D%/automake: %D%/automake.in
-%D%/aclocal: %D%/aclocal.in
-%D%/automake %D%/aclocal: Makefile %D%/gen-perl-protos
+# $(datadir) or other do_subst'd variables change.
+%D%/automake %D%/aclocal: %: %.in Makefile %D%/gen-perl-protos
 	$(AM_V_GEN)rm -f $@ $@-t $@-t2 \
 ## Common substitutions.
-	  && in=$@.in && $(do_subst) <$(srcdir)/$$in >$@-t \
+	  && $(do_subst)  \
 ## Auto-compute prototypes of perl subroutines.
 	  && $(PERL) -w $(srcdir)/%D%/gen-perl-protos $@-t > $@-t2 \
 	  && mv -f $@-t2 $@-t \
diff --git a/contrib/t/Makefile.inc b/contrib/t/Makefile.inc
index a92b80d96..29eb43688 100644
--- a/contrib/t/Makefile.inc
+++ b/contrib/t/Makefile.inc
@@ -21,6 +21,4 @@
 
 contrib_TESTS = \
   %D%/parallel-tests-html.sh \
-  %D%/parallel-tests-html-recursive.sh \
-  %D%/help-multilib.sh \
-  %D%/multilib.sh
+  %D%/parallel-tests-html-recursive.sh
diff --git a/contrib/t/local.am b/contrib/t/local.am
deleted file mode 100644
index 7a88f47e2..000000000
--- a/contrib/t/local.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright (C) 1995-2013 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# Automake: tests for stuff in 'contrib/'.
-
-## Relative to the top-level directory.
-contrib_testsuite_dir = contrib/t
-
-contrib_TESTS = \
-  $(contrib_testsuite_dir)/parallel-tests-html.sh \
-  $(contrib_testsuite_dir)/parallel-tests-html-recursive.sh
diff --git a/doc/Makefile.inc b/doc/Makefile.inc
index dd477d6f9..603d45d4c 100644
--- a/doc/Makefile.inc
+++ b/doc/Makefile.inc
@@ -19,37 +19,31 @@
 ##  Documentation.  ##
 ## ---------------- ##
 
-info_TEXINFOS = %D%/automake.texi %D%/automake-history.texi
-doc_automake_TEXINFOS = %D%/fdl.texi
-doc_automake_history_TEXINFOS = %D%/fdl.texi
-
-man1_MANS = \
-  %D%/aclocal.1 \
-  %D%/automake.1 \
-  %D%/aclocal-$(APIVERSION).1 \
-  %D%/automake-$(APIVERSION).1
+## ---------------- ##
+##  Documentation.  ##
+## ---------------- ##
 
-$(man1_MANS): $(top_srcdir)/configure.ac
+info_TEXINFOS = %D%/automake-ng.texi
+doc_automake_ng_TEXINFOS = %D%/fdl.texi
 
 CLEANFILES += $(man1_MANS)
 EXTRA_DIST += %D%/help2man
 
-update_mans = \
-  $(AM_V_GEN): \
-    && $(MKDIR_P) %D% \
-    && $(extend_PATH) \
-    && $(PERL) $(srcdir)/%D%/help2man --output=$@
+man1_MANS = $(versioned_mans) $(unversioned_mans)
+
+unversioned_mans = %D%/aclocal.1 %D%/automake.1
+versioned_mans = %D%/aclocal-$(APIVERSION).1 %D%/automake-$(APIVERSION).1
 
-%D%/aclocal.1 %D%/automake.1:
-	$(AM_V_GEN): \
-	  && $(MKDIR_P) %D% \
-	  && f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'` \
+$(unversioned_mans): Makefile
+	$(AM_V_GEN)$(MKDIR_P) %D% \
+	  && f=`echo $(@D) | sed 's|.*/||; s|\.1$$||; $(transform)'` \
 	  && echo ".so man1/$$f-$(APIVERSION).1" > $@
 
-%D%/aclocal-$(APIVERSION).1: $(aclocal_script) lib/Automake/Config.pm
-	$(update_mans) aclocal-$(APIVERSION)
-%D%/automake-$(APIVERSION).1: $(automake_script) lib/Automake/Config.pm
-	$(update_mans) automake-$(APIVERSION)
+$(versioned_mans): %D%/%-$(APIVERSION).1: bin/% lib/Automake/Config.pm
+	 $(AM_V_GEN)$(MKDIR_P) %D% \
+	    && $(extend_PATH) \
+	    && $(PERL) $(srcdir)/%D%/help2man --output=$@ $*-$(APIVERSION)
+
 
 ## ---------------------------- ##
 ##  Example package "amhello".  ##
@@ -71,6 +65,7 @@ amhello_configury = \
   depcomp \
   install-sh \
   missing \
+  am-ng \
   src/Makefile.in
 
 dist_noinst_DATA += $(amhello_sources)
@@ -92,15 +87,15 @@ setup_autotools_paths = { \
 # whenever the Automake version changes.
 $(srcdir)/%D%/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
 	$(AM_V_GEN)tmp=amhello-output.tmp \
-	  && $(am__cd) $(srcdir)/%D%/amhello \
+	  && cd $(srcdir)/%D%/amhello \
 	  && : Make our	aclocal and automake avaiable before system ones. \
 	  && $(setup_autotools_paths) \
 	  && ( \
 	    { $(AM_V_P) || exec 5>&2 >$$tmp 2>&1; } \
 	      && $(am_AUTORECONF) -vfi \
 	      && ./configure \
-	      && $(MAKE) $(AM_MAKEFLAGS) distcheck \
-	      && $(MAKE) $(AM_MAKEFLAGS) distclean \
+	      && $(MAKE) distcheck \
+	      && $(MAKE) distclean \
 	      || { \
 	        if $(AM_V_P); then :; else \
 	          echo "$@: recipe failed." >&5; \
diff --git a/lib/Automake/Makefile.inc b/lib/Automake/Makefile.inc
index 051915656..a0028c362 100644
--- a/lib/Automake/Makefile.inc
+++ b/lib/Automake/Makefile.inc
@@ -48,8 +48,7 @@ CLEANFILES += $(nodist_perllib_DATA)
 %D%/Config.pm: %D%/Config.in Makefile
 	$(AM_V_at)rm -f $@ $@-t
 	$(AM_V_at)$(MKDIR_P) %D%
-	$(AM_V_GEN)in=Config.in \
-	  && $(do_subst) <$(srcdir)/%D%/Config.in >$@-t
+	$(AM_V_GEN)$(do_subst)
 	$(generated_file_finalize)
 EXTRA_DIST += %D%/Config.in
 
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index d1971f55f..e5fcb707e 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -33,7 +33,6 @@ dist_script_DATA = \
   %D%/install-sh \
   %D%/mdate-sh \
   %D%/missing \
-  %D%/mkinstalldirs \
   %D%/ylwrap \
   %D%/depcomp \
   %D%/compile \
@@ -45,24 +44,14 @@ dist_script_DATA = \
 
 install-data-hook:
 	@$(POST_INSTALL)
-	@for f in $(dist_script_DATA); do echo $$f; done \
-	  | sed 's,^%D%/,,' \
-	  | ( st=0; \
-	      while read f; do \
-	        echo " chmod +x '$(DESTDIR)$(scriptdir)/$$f'"; \
-	        chmod +x "$(DESTDIR)$(scriptdir)/$$f" || st=1; \
-	      done; \
-	      exit $$st )
+	chmod +x $(patsubst %D%/%,'$(DESTDIR)$(scriptdir)/%',$(dist_script_DATA))
 
 installcheck-local: installcheck-executable-scripts
 installcheck-executable-scripts:
-	@for f in $(dist_script_DATA); do echo $$f; done \
-	  | sed 's,^%D%/,,' \
-	  | while read f; do \
-	      path="$(pkgvdatadir)/$$f"; \
-	      test -x "$$path" || echo $$path; \
-	    done \
-	  | sed 's/$$/: not executable/' \
-	  | grep . 1>&2 && exit 1; exit 0
+	@st=0; \
+	 for f in $(patsubst %D%/%,'$(scriptdir)/%',$(dist_script_DATA)); do \
+	   test -x $$f || { echo "$@: $$f: not executable" >&2; st=1; }; \
+	 done; \
+	 exit $$st;
 
 # vim: ft=automake noet
diff --git a/lib/am/Makefile.inc b/lib/am/Makefile.inc
index da9468284..63b77bef1 100644
--- a/lib/am/Makefile.inc
+++ b/lib/am/Makefile.inc
@@ -22,28 +22,32 @@
 amdir = @amdir@
 
 dist_am_DATA = \
-  %D%/check.am \
-  %D%/check2.am \
-  %D%/clean-hdr.am \
-  %D%/clean.am \
+  %D%/am-dir.mk \
+  %D%/common-targets.mk \
+  %D%/color-tests.mk \
+  %D%/serial-tests.mk \
+  %D%/parallel-tests.mk \
+  %D%/check-typos.mk \
+  %D%/clean.mk \
+  %D%/header-vars.mk \
+  %D%/tags.mk \
+  %D%/dejagnu.mk \
+  %D%/distcheck.mk \
+  %D%/distdir.mk \
+  %D%/subdirs.mk \
+  %D%/texibuild.mk \
+  %D%/texinfos.mk \
   %D%/compile.am \
   %D%/configure.am \
   %D%/data.am \
-  %D%/dejagnu.am \
-  %D%/depend.am \
   %D%/depend2.am \
-  %D%/distdir.am \
   %D%/footer.am \
-  %D%/header-vars.am \
   %D%/header.am \
-  %D%/install.am \
-  %D%/inst-vars.am \
   %D%/java.am \
   %D%/lang-compile.am \
   %D%/lex.am \
   %D%/library.am \
   %D%/libs.am \
-  %D%/libtool.am \
   %D%/lisp.am \
   %D%/ltlib.am \
   %D%/ltlibrary.am \
@@ -54,11 +58,8 @@ dist_am_DATA = \
   %D%/python.am \
   %D%/remake-hdr.am \
   %D%/scripts.am \
-  %D%/subdirs.am \
-  %D%/tags.am \
   %D%/texi-vers.am \
-  %D%/texibuild.am \
-  %D%/texinfos.am \
+  %D%/texi-spec.am \
   %D%/vala.am \
   %D%/yacc.am
 
diff --git a/m4/Makefile.inc b/m4/Makefile.inc
index ac7067df7..ad3048ba7 100644
--- a/m4/Makefile.inc
+++ b/m4/Makefile.inc
@@ -30,7 +30,6 @@ dist_automake_ac_DATA = \
   %D%/cond.m4 \
   %D%/cond-if.m4 \
   %D%/depend.m4 \
-  %D%/depout.m4 \
   %D%/dmalloc.m4 \
   %D%/extra-recurs.m4 \
   %D%/gcj.m4 \
@@ -38,8 +37,6 @@ dist_automake_ac_DATA = \
   %D%/install-sh.m4 \
   %D%/lex.m4 \
   %D%/lispdir.m4 \
-  %D%/maintainer.m4 \
-  %D%/make.m4 \
   %D%/minuso.m4 \
   %D%/missing.m4 \
   %D%/obsolete.m4 \
@@ -64,13 +61,10 @@ dist_automake_internal_ac_DATA = %D%/internal/ac-config-macro-dirs.m4
 # dependencies change and amversion.m4 happens to be a configure
 # dependency.  configure and amversion.m4 would be rebuilt in
 # loop otherwise.
-# Use '$(top_srcdir)' for the benefit of non-GNU makes: this is
-# how amversion.m4 appears in our dependencies.
-$(top_srcdir)/%D%/amversion.m4: $(srcdir)/configure.ac \
-                                $(srcdir)/%D%/amversion.in
+$(srcdir)/%D%/amversion.m4: $(srcdir)/%D%/amversion.in \
+                            $(srcdir)/configure.ac
 	$(AM_V_at)rm -f $@-t $@
-	$(AM_V_GEN)in=amversion.in \
-	  && $(do_subst) <$(srcdir)/%D%/amversion.in >$@-t
+	$(AM_V_GEN)$(do_subst)
 	$(generated_file_finalize)
 EXTRA_DIST += %D%/amversion.in
 
diff --git a/t/Makefile.inc b/t/Makefile.inc
index 18a57c2c2..05c9edb2b 100644
--- a/t/Makefile.inc
+++ b/t/Makefile.inc
@@ -34,9 +34,68 @@ AM_TAP_LOG_DRIVER_FLAGS = --merge
 
 EXTRA_DIST += %D%/README %D%/ax/is %D%/ax/is_newest
 
-## Will be updated later.
-TESTS =
+# Hand-written tests for stuff in 'contrib/'.
+include $(srcdir)/contrib/%D%/Makefile.inc
 
+# All tests, both hand-written and autogenerated.
+# IMPORTANT: This assumes that the autogenerated tests are placed
+#            in the $(srcdir) as well!
+all_TESTS = \
+  $(wildcard $(srcdir)/%D%/*.sh) \
+  $(wildcard $(srcdir)/%D%/*.tap) \
+  $(wildcard $(srcdir)/%D%/pm/*.pl)
+
+# This is to ensure longer-running tests will be run earlier, which is
+# useful when running the testsuite in parallel on multicore machines.
+# Here too we assume that the autogenerated tests are placed in $(srcdir).
+long_running_TESTS = \
+  $(srcdir)/%D%/dist-many.sh \
+  $(srcdir)/%D%/parallel-tests-many.sh \
+  $(srcdir)/%D%/add-missing.tap \
+  $(srcdir)/%D%/instspc.tap \
+  $(wildcard $(srcdir)/%D%/depcomp-*.tap) \
+  $(wildcard $(srcdir)/%D%/*libtool*.sh) \
+  $(wildcard $(srcdir)/%D%/lt*.sh) \
+  $(wildcard $(srcdir)/%D%/remake*.sh)
+
+TESTS = \
+  $(long_running_TESTS) \
+  $(filter-out $(long_running_TESTS), $(all_TESTS)) \
+  $(contrib_TESTS)
+
+EXTRA_DIST += $(TESTS)
+
+# FIXME: this "expected failures" are in truth an hack used to
+# FIXME: to verify that some incorrect usages of our perl libraries
+# FIXME: raise an error.  We should find a cleaner way to check that.
+perl_fake_XFAIL_TESTS = \
+  %D%/pm/Cond2.pl \
+  %D%/pm/Cond3.pl \
+  %D%/pm/DisjCon2.pl \
+  %D%/pm/DisjCon3.pl \
+  %D%/pm/Version2.pl \
+  %D%/pm/Version3.pl
+
+XFAIL_TESTS = \
+  %D%/all.sh \
+  %D%/override-suggest-local.sh \
+  %D%/comments-in-var-def.sh \
+  %D%/cond17.sh \
+  %D%/dist-srcdir2.sh \
+  %D%/gcj6.sh \
+  %D%/txinfo-nodist-info.sh \
+  %D%/override-conditional-2.sh \
+  %D%/dist-pr109765.sh \
+  %D%/instdir-cond2.sh \
+  %D%/interp3.sh \
+  %D%/java-nobase.sh \
+  %D%/objext-pr10128.sh \
+  %D%/remake-timing-bug-pr8365.sh \
+  %D%/remake-am-pr10111.sh \
+  %D%/remake-m4-pr10111.sh \
+  %D%/var-undef-append.sh \
+  $(perl_fake_XFAIL_TESTS)
+ 
 # Some testsuite-influential variables should be overridable from the
 # test scripts, but not from the environment.
 # Keep this in sync with the similar list in ax/runtest.in.
@@ -68,40 +127,17 @@ AM_TESTS_ENVIRONMENT += \
   PATH='$(abs_builddir)/%D%/ax'$(PATH_SEPARATOR)$$PATH; \
   export PATH;
 
-# Hand-written tests.
-
-include $(srcdir)/%D%/list-of-tests.mk
-
-TESTS += $(handwritten_TESTS)
-EXTRA_DIST += $(handwritten_TESTS)
-
-# Automatically-generated tests wrapping hand-written ones.
-# Also, automatically-computed dependencies for tests.
-
-include $(srcdir)/%D%/testsuite-part.am
-
-TESTS += $(generated_TESTS)
-EXTRA_DIST += $(generated_TESTS)
-
-$(srcdir)/%D%/testsuite-part.am:
-	$(AM_V_at)rm -f %D%/testsuite-part.tmp $@
-	$(AM_V_GEN)$(PERL) $(srcdir)/gen-testsuite-part \
-	  --srcdir $(srcdir) > %D%/testsuite-part.tmp
-	$(AM_V_at)chmod a-w %D%/testsuite-part.tmp
-	$(AM_V_at)mv -f %D%/testsuite-part.tmp $@
-EXTRA_DIST += gen-testsuite-part
+# Automatically-computed dependencies for tests.
+include $(srcdir)/testsuite-autodeps.am
 
-# The dependecies declared here are not truly complete, but such
+# The dependencies declared here are not truly complete, but such
 # completeness would cause more issues than it would solve.  See
 # automake bug#11347.
-$(generated_TESTS): $(srcdir)/gen-testsuite-part
-$(srcdir)/%D%/testsuite-part.am: $(srcdir)/gen-testsuite-part
-$(srcdir)/%D%/testsuite-part.am: Makefile.am
-
-# Hand-written tests for stuff in 'contrib/'.
-include $(srcdir)/contrib/%D%/Makefile.inc
-TESTS += $(contrib_TESTS)
-EXTRA_DIST += $(contrib_TESTS)
+$(srcdir)/testsuite-autodeps.am: $(srcdir)/gen-testsuite-part
+	$(AM_V_at)rm -f $(@F)-t $@
+	$(AM_V_GEN)$(PERL) $< --srcdir $(srcdir) > $(@F)-t
+	$(AM_V_at)chmod a-w $(@F)-t && mv -f $(@F)-t $@
+EXTRA_DIST += gen-testsuite-part
 
 # Static dependencies valid for each test case (also further
 # extended later).  Note that use 'noinst_' rather than 'check_'
@@ -126,9 +162,8 @@ EXTRA_DIST += %D%/ax/distcheck-hook-m4.am
 
 %D%/ax/test-defs.sh: %D%/ax/test-defs.in Makefile
 	$(AM_V_at)rm -f $@ $@-t
-	$(AM_V_at)$(MKDIR_P) %D%/ax
-	$(AM_V_GEN)in=%D%/ax/test-defs.in \
-	  && $(do_subst) <$(srcdir)/$$in >$@-t
+	$(AM_V_at)$(MKDIR_P) $(@D)
+	$(AM_V_GEN)$(do_subst)
 	$(generated_file_finalize)
 EXTRA_DIST += %D%/ax/test-defs.in
 CLEANFILES += %D%/ax/test-defs.sh
@@ -136,10 +171,9 @@ nodist_noinst_DATA += %D%/ax/test-defs.sh
 
 %D%/ax/shell-no-trail-bslash: %D%/ax/shell-no-trail-bslash.in Makefile
 	$(AM_V_at)rm -f $@ $@-t
-	$(AM_V_GEN)in=%D%/ax/shell-no-trail-bslash.in \
-	  && $(MKDIR_P) %D%/ax \
-	  && $(do_subst) <$(srcdir)/$$in >$@-t \
-	  && chmod a+x $@-t
+	$(AM_V_at)$(MKDIR_P) $(@D)
+	$(AM_V_GEN)$(do_subst)
+	$(AM_V_at)chmod a+x $@-t
 	$(generated_file_finalize)
 EXTRA_DIST += %D%/ax/shell-no-trail-bslash.in
 CLEANFILES += %D%/ax/shell-no-trail-bslash
@@ -147,10 +181,9 @@ nodist_noinst_SCRIPTS += %D%/ax/shell-no-trail-bslash
 
 %D%/ax/cc-no-c-o: %D%/ax/cc-no-c-o.in Makefile
 	$(AM_V_at)rm -f $@ $@-t
-	$(AM_V_GEN)in=%D%/ax/cc-no-c-o.in \
-	  && $(MKDIR_P) %D%/ax \
-	  && $(do_subst) <$(srcdir)/$$in >$@-t \
-	  && chmod a+x $@-t
+	$(AM_V_at)$(MKDIR_P) $(@D)
+	$(AM_V_GEN)$(do_subst)
+	$(AM_V_at)chmod a+x $@-t
 	$(generated_file_finalize)
 EXTRA_DIST += %D%/ax/cc-no-c-o.in
 CLEANFILES += %D%/ax/cc-no-c-o
@@ -158,10 +191,9 @@ nodist_noinst_SCRIPTS += %D%/ax/cc-no-c-o
 
 runtest: %D%/ax/runtest.in Makefile
 	$(AM_V_at)rm -f $@ $@-t
-	$(AM_V_GEN)in=%D%/ax/runtest.in \
-	  && $(MKDIR_P) %D%/ax \
-	  && $(do_subst) <$(srcdir)/$$in >$@-t \
-	  && chmod a+x $@-t
+	$(AM_V_at)$(MKDIR_P) $(@D)
+	$(AM_V_GEN)$(do_subst)
+	$(AM_V_at)chmod a+x $@-t
 	$(generated_file_finalize)
 EXTRA_DIST += %D%/ax/runtest.in
 CLEANFILES += runtest
@@ -224,7 +256,7 @@ check-local: check-tests-syntax
 # that helps catching such problems in Automake-generated recipes.
 # See automake bug#10436.
 check-no-trailing-backslash-in-recipes:
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check \
+	$(AM_V_at)$(MAKE) check \
 	  CONFIG_SHELL='$(abs_top_builddir)/%D%/ax/shell-no-trail-bslash'
 .PHONY: check-no-trailing-backslash-in-recipes
 
@@ -234,25 +266,27 @@ check-no-trailing-backslash-in-recipes:
 # otherwise only present themselves later "in the wild".  See also the
 # long discussion about automake bug#13378.
 check-cc-no-c-o:
-	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) check \
+	$(AM_V_at)$(MAKE) check \
 	  CC='$(abs_top_builddir)/%D%/ax/cc-no-c-o' \
 	  GNU_CC='$(abs_top_builddir)/%D%/ax/cc-no-c-o'
 .PHONY: check-cc-no-c-o
 
-## Checking the list of tests.
-test_subdirs = %D% %D%/pm contrib/%D%
-include %D%/CheckListOfTests.am
-
 # Run the testsuite with the installed aclocal and automake.
 installcheck-local: installcheck-testsuite
 installcheck-testsuite:
-	am_running_installcheck=yes $(MAKE) $(AM_MAKEFLAGS) check
+	am_running_installcheck=yes $(MAKE) check
 
+# Run the testsuite without skipping expensive tests by default.
+check-expensive installcheck-expensive: %-expensive:
+	$(MAKE) $* RUN_EXPENSIVE_TESTS=yes
+ 
 # Performance tests.
-.PHONY: perf
 perf: all
-	$(MAKE) $(AM_MAKEFLAGS) TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)'	\
-	                        TESTS='$(perf_TESTS)' check
+	$(MAKE) TEST_SUITE_LOG='$(PERF_TEST_SUITE_LOG)'	\
+	        TESTS='$(perf_TESTS)' check
+.PHONY: perf
+perf_TESTS = $(wildcard $(srcdir)/t/perf/*.sh) \
+             $(wildcard $(srcdir)/t/perf/*.tap)
 PERF_TEST_SUITE_LOG = %D%/perf/test-suite.log
 CLEANFILES += $(PERF_TEST_SUITE_LOG)
 EXTRA_DIST += $(perf_TESTS)