maint: remove most recursion in automake's own build system

Recursive make-based build systems tend to be slower, more fragile
and less faithful than "flat" ones.  See Peter Miller's article
"Recursive Make Considered Harmful" for more a more in-depth
discussion:

    <http://miller.emu.id.au/pmiller/books/rmch/>

While in the case of automake this isn't a big problem (given the
small size of its build systems), it still creates occasional
glitches and annoyances.

With this change, the use of recursion in Automake's own build
system is eliminated *but for the testsuite*.  Converting that
is a little more tricky, and better left for a later change (or
series of changes).

See also commit v1.11-769-gfeeb7f6 of 28-03-2012.

* contrib/Makefile.am, lib/Makefile.am, m4/Makefile.am,
doc/Makefile.am:  Removed, their content merged ...
* Makefile.am: ... here, with required adjustments and few
other "opportunistic" changes.
(SUBDIRS): Update.
* configure.ac (AC_CONFIG_FILES): Likewise.
* .gitignore: Likewise.

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

1 files changed, 0 insertions, 91 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index ffd294da1..000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,91 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-## Makefile for Automake.
-
-# Copyright (C) 2003-2012 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/>.
-
-info_TEXINFOS = automake.texi automake-history.texi
-automake_TEXINFOS = fdl.texi
-history_TEXINFOS = fdl.texi
-
-dist_man1_MANS = \
-  $(srcdir)/aclocal.1 \
-  $(srcdir)/automake.1 \
-  $(srcdir)/aclocal-$(APIVERSION).1 \
-  $(srcdir)/automake-$(APIVERSION).1
-MAINTAINERCLEANFILES = $(dist_man1_MANS)
-update_mans = \
-  $(AM_V_GEN): && \
-  PATH="$(abs_top_builddir)/tests/wrap$(PATH_SEPARATOR)$$PATH" && \
-  export PATH && \
-  $(HELP2MAN) --output=$@
-$(dist_man1_MANS): $(top_srcdir)/configure.ac
-$(srcdir)/aclocal.1 $(srcdir)/automake.1:
-	$(AM_V_GEN)f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'`; \
-	echo ".so man1/$$f-$(APIVERSION).1" > $@
-$(srcdir)/aclocal-$(APIVERSION).1: $(srcdir)/../aclocal.in
-	$(update_mans) aclocal-$(APIVERSION)
-$(srcdir)/automake-$(APIVERSION).1: $(srcdir)/../automake.in
-	$(update_mans) automake-$(APIVERSION)
-
-# The following requires a fixed version of the Emacs 19.30 etags.
-ETAGS_ARGS = --lang=none \
- --regex='/^@node[ \t]+\([^,]+\)/\1/' $(srcdir)/automake.texi
-TAGS_DEPENDENCIES = automake.texi
-
-amhello_sources = \
-  amhello/configure.ac \
-  amhello/Makefile.am \
-  amhello/README \
-  amhello/src/main.c \
-  amhello/src/Makefile.am
-
-amhello_configury = \
-  aclocal.m4 \
-  autom4te.cache \
-  Makefile.in \
-  config.h.in \
-  configure \
-  depcomp \
-  install-sh \
-  missing \
-  src/Makefile.in
-
-dist_noinst_DATA = $(amhello_sources)
-dist_doc_DATA = $(srcdir)/amhello-1.0.tar.gz
-
-# We depend on configure.ac so that we regenerate the tarball
-# whenever the Automake version changes.
-# aclocal-$(APIVERSION) and automake-$(APIVERSION) are generated by
-# configure in tests/.
-$(srcdir)/amhello-1.0.tar.gz: $(amhello_sources) $(top_srcdir)/configure.ac
-	$(AM_V_GEN): && \
-	PATH="$(abs_top_builddir)/tests/wrap$(PATH_SEPARATOR)$$PATH" && \
-	export PATH && \
-	$(am__cd) $(srcdir)/amhello && \
-	ACLOCAL=aclocal-$(APIVERSION) && export ACLOCAL && \
-	AUTOMAKE=automake-$(APIVERSION) && export AUTOMAKE && \
-	AUTOCONF='$(am_AUTOCONF)' && export AUTOCONF && \
-	AUTOM4TE='$(am_AUTOM4TE)' && export AUTOM4TE && \
-	AUTORECONF='$(am_AUTORECONF)' && export AUTORECONF && \
-	AUTOHEADER='$(am_AUTOHEADER)' && export AUTOHEADER && \
-	AUTOUPDATE='$(am_AUTOUPDATE)' && export AUTOUPDATE && \
-	$(am_AUTORECONF) -vfi && \
-	./configure && \
-	$(MAKE) $(AM_MAKEFLAGS) distcheck && \
-	$(MAKE) $(AM_MAKEFLAGS) distclean && \
-	rm -rf $(amhello_configury) && \
-	mv amhello-1.0.tar.gz ..