Merge branch 'maint'

* maint:
  cosmetics: don't make the generated Config.pm executable
  maint: reduce use of recursion in automake build system

+ Extra non-trivial extra edits follows.

* lib/Makefile.am (amdir): Deleted this definition, it is already
provided by a proper AC_SUBST in configure.ac.
(dist_am_DATA): Remove 'am/ansi2knr.am', 'am/check-html.am' and
'am/multilib.am'.
(dist_perllib_DATA): Remove 'Automake/Struct.pm'.

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

diff --cc configure.ac
index c8d5a34,4b0be1b..e7b62e9
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -399,20 -208,16 +399,18 @@@ AC_CONFIG_FILES(
    Makefile
    contrib/Makefile
    doc/Makefile
-   lib/Automake/Makefile
    lib/Makefile
-   lib/am/Makefile
    m4/Makefile
    tests/Makefile
 -  tests/defs
  ])
 -AC_CONFIG_FILES([tests/aclocal-${APIVERSION}:tests/aclocal.in],
 -                [chmod +x tests/aclocal-${APIVERSION}],
 +AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
 +AC_CONFIG_LINKS([tests/defs:tests/defs])
 +AC_CONFIG_FILES([tests/wrap/aclocal-${APIVERSION}:tests/wrap/aclocal.in],
 +                [chmod +x tests/wrap/aclocal-${APIVERSION}],
 +              [APIVERSION=$APIVERSION])
 +AC_CONFIG_FILES([tests/wrap/automake-${APIVERSION}:tests/wrap/automake.in],
 +                [chmod +x tests/wrap/automake-${APIVERSION}],
                [APIVERSION=$APIVERSION])
 -AC_CONFIG_FILES([tests/automake-${APIVERSION}:tests/automake.in],
 -                [chmod +x tests/automake-${APIVERSION}])
  
  AC_OUTPUT
  

diff --cc lib/Makefile.am
index f56db26,260b9c9..b7f23cd
--- 1/lib/Makefile.am
--- 2/lib/Makefile.am
+++ b/lib/Makefile.am
@@@ -17,46 -17,137 +17,146 @@@
  # You should have received a copy of the GNU General Public License
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
- SUBDIRS = Automake am
+ EXTRA_DIST = gnupload gitlog-to-changelog update-copyright
+ 
+ ## -------------------------------------------------------------------- ##
+ ##  Auxiliary scripts and files for use with "automake --add-missing".  ##
+ ## -------------------------------------------------------------------- ##
  
 -dist_pkgvdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
 -  config-ml.in
 +dist_pkgvdata_DATA = \
 +  COPYING \
 +  INSTALL \
 +  texinfo.tex
  
  ## These must all be executable when installed.  However, if we use
  ## _SCRIPTS, then the program transform will be applied, which is not
  ## what we want.  So we make them executable by hand.
 -scriptdir = $(pkgvdatadir)
 -dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
 -  mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile \
 -  symlink-tree ar-lib
 +dist_script_DATA = \
 +  config.guess \
 +  config.sub \
 +  install-sh \
 +  mdate-sh \
 +  missing \
 +  mkinstalldirs \
 +  elisp-comp \
 +  ylwrap \
 +  depcomp \
 +  compile \
 +  py-compile \
 +  ar-lib \
 +  test-driver \
 +  tap-driver.sh \
 +  tap-driver.pl
  
- EXTRA_DIST = gnupload gitlog-to-changelog update-copyright
- 
  install-data-hook:
        @$(POST_INSTALL)
        @for prog in $(dist_script_DATA); do \
 -        echo " chmod +x $(DESTDIR)$(scriptdir)/$$prog"; \
 -        chmod +x $(DESTDIR)$(scriptdir)/$$prog; \
 +        echo " chmod +x '$(DESTDIR)$(scriptdir)/$$prog'"; \
 +        chmod +x "$(DESTDIR)$(scriptdir)/$$prog"; \
        done
  
 -## `test -x' is not portable.  So we use Perl instead.  If Perl
 -## doesn't exist, then this test is meaningless anyway.
  installcheck-local:
 -      for file in $(dist_script_DATA); do \
 -        $(PERL) -e "exit ! -x '$(pkgvdatadir)/$$file';" || exit 1; \
 -      done
 +      @for file in $(dist_script_DATA); do \
 +        path="$(pkgvdatadir)/$$file"; \
 +        test -x "$$path" || echo $$path; \
 +      done \
 +        | sed 's/$$/: not executable/' \
 +        | grep . && exit 1; exit 0
+ 
+ ## ---------------------------------------------------- ##
+ ##  Private perl modules used by automake and aclocal.  ##
+ ## ---------------------------------------------------- ##
+ 
+ perllibdir = $(pkgvdatadir)/Automake
+ dist_perllib_DATA = \
+   Automake/ChannelDefs.pm \
+   Automake/Channels.pm \
+   Automake/Condition.pm \
+   Automake/Configure_ac.pm \
+   Automake/DisjConditions.pm \
+   Automake/FileUtils.pm \
+   Automake/General.pm \
+   Automake/Getopt.pm \
+   Automake/Item.pm \
+   Automake/ItemDef.pm \
+   Automake/Location.pm \
+   Automake/Options.pm \
+   Automake/Rule.pm \
+   Automake/RuleDef.pm \
 -  Automake/Struct.pm \
+   Automake/Variable.pm \
+   Automake/VarDef.pm \
+   Automake/Version.pm \
+   Automake/XFile.pm \
+   Automake/Wrap.pm
+ 
+ nodist_perllib_DATA = Automake/Config.pm
+ CLEANFILES = $(nodist_perllib_DATA)
+ 
+ ## We can't use configure to do the substitution here; we must do it
+ ## by hand.  We use a funny notation here to avoid configure
+ ## substitutions in our text.
+ do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
+   -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
+   -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+   -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
+   -e 's,[@]PERL[@],$(PERL),g' \
+   -e 's,[@]PERL_THREADS[@],$(PERL_THREADS),g' \
+   -e 's,[@]SHELL[@],$(SHELL),g' \
+   -e 's,[@]VERSION[@],$(VERSION),g' \
+   -e "s,[@]configure_input[@],Generated from $$in.in; do not edit by hand.,g" \
+   -e 's,[@]datadir[@],$(datadir),g'
+ 
+ ## This file depends on Makefile so it is rebuilt if $(VERSION),
+ ## $(datadir) or other do_subst'ituted variables change.
+ ## Use chmod a-w to prevent people from editing the wrong file by accident.
+ Automake/Config.pm: Automake/Config.in Makefile
+       $(AM_V_at)rm -f $@ $@-t
+       $(AM_V_at)test -d Automake || mkdir Automake
+       $(AM_V_GEN)$(do_subst) $(srcdir)/Automake/Config.in >$@-t
+       $(AM_V_at)chmod a-w $@-t && mv -f $@-t $@
+ EXTRA_DIST += Automake/Config.in
+ 
+ ## --------------------- ##
+ ##  Makefile fragments.  ##
+ ## --------------------- ##
+ 
 -amdir = $(pkgvdatadir)/am
 -
+ dist_am_DATA = \
 -  am/ansi2knr.am \
+   am/check.am \
 -  am/check-html.am \
+   am/check2.am \
+   am/clean-hdr.am \
+   am/clean.am \
+   am/compile.am \
+   am/configure.am \
+   am/data.am \
+   am/dejagnu.am \
+   am/depend.am \
+   am/depend2.am \
+   am/distdir.am \
+   am/footer.am \
+   am/header-vars.am \
+   am/header.am \
+   am/install.am \
+   am/inst-vars.am \
+   am/java.am \
+   am/lang-compile.am \
+   am/lex.am \
+   am/library.am \
+   am/libs.am \
+   am/libtool.am \
+   am/lisp.am \
+   am/ltlib.am \
+   am/ltlibrary.am \
+   am/mans-vars.am \
+   am/mans.am \
 -  am/multilib.am \
+   am/program.am \
+   am/progs.am \
+   am/python.am \
+   am/remake-hdr.am \
+   am/scripts.am \
+   am/subdirs.am \
+   am/tags.am \
+   am/texi-vers.am \
+   am/texibuild.am \
+   am/texinfos.am \
+   am/vala.am \
+   am/yacc.am