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, 75 deletions

diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index 572fca7b2..000000000
--- a/m4/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-## Makefile for Automake m4.
-
-# Copyright (C) 1996-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/>.
-
-dist_automake_ac_DATA = \
-$(top_srcdir)/m4/amversion.m4 \
-ar-lib.m4 \
-as.m4 \
-auxdir.m4 \
-ccstdc.m4 \
-cond.m4 \
-cond-if.m4 \
-depend.m4 \
-depout.m4 \
-dmalloc.m4 \
-gcj.m4 \
-header.m4 \
-init.m4 \
-install-sh.m4 \
-lead-dot.m4 \
-lex.m4 \
-lispdir.m4 \
-maintainer.m4 \
-make.m4 \
-minuso.m4 \
-missing.m4 \
-mkdirp.m4 \
-obsol-gt.m4 \
-obsol-lt.m4 \
-obsolete.m4 \
-options.m4 \
-protos.m4 \
-python.m4 \
-runlog.m4 \
-sanity.m4 \
-silent.m4 \
-strip.m4 \
-substnot.m4 \
-tar.m4 \
-upc.m4 \
-vala.m4
-
-dist_system_ac_DATA = acdir/README
-
-EXTRA_DIST = amversion.in
-
-# We build amversion.m4 here, instead of from config.status,
-# because config.status is rerun each time one of configure's
-# dependencies change and amversion.m4 happens to be a configure
-# dependency.  configure and amversion.m4 would be rebuilt in
-# loop otherwise.
-# Use '$(top_srcdir)/m4' for the benefit of non-GNU makes: this is
-# how amversion.m4 appears in our dependencies.
-$(top_srcdir)/m4/amversion.m4: $(top_srcdir)/configure.ac $(srcdir)/amversion.in
-	$(AM_V_at)sed \
-	    -e 's,[@]VERSION[@],$(VERSION),g' \
-	    -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
-	    -e "s,[@]configure_input[@],Generated from amversion.in; do not edit by hand.,g" \
-	    $(srcdir)/amversion.in > $@-t
-	@$(AM_V_at)chmod a-w $@-t && mv -f $@-t $@