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

automake-patches
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] maint: remove most recursion in automake's own build system

From:	Stefano Lattarini
Subject:	[PATCH] maint: remove most recursion in automake's own build system
Date:	Thu, 5 Apr 2012 13:27:13 +0200
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 <address@hidden>
---

 I will push by tomorrow if there is no objection.

 Regards,
   Stefano

 .gitignore          |   33 ++---
 Makefile.am         |  414 +++++++++++++++++++++++++++++++++++++++++++++++----
 configure.ac        |    9 +-
 contrib/Makefile.am |   27 ----
 doc/Makefile.am     |   91 -----------
 lib/Makefile.am     |  162 --------------------
 m4/Makefile.am      |   75 ---------
 7 files changed, 395 insertions(+), 416 deletions(-)
 delete mode 100644 contrib/Makefile.am
 delete mode 100644 doc/Makefile.am
 delete mode 100644 lib/Makefile.am
 delete mode 100644 m4/Makefile.am

diff --git a/.gitignore b/.gitignore
index fd0c05b..f7d9c2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,10 @@
-Makefile.in
-Makefile
 /ChangeLog
 /aclocal.m4
 /configure
+/Makefile.in
+/Makefile
+/tests/Makefile.in
+/tests/Makefile
 /.autom4te.cache
 /config.cache
 /config.log
@@ -11,33 +13,18 @@ Makefile
 /configure.lineno
 /aclocal
 /automake
-/doc/amhello-*.tar.gz
+/doc/.dirstamp
 /doc/automake*.info
 /doc/automake*.info-[0-9]
+/doc/automake*.html
+/doc/automake*.dvi
+/doc/automake*.pdf
+/doc/automake*.ps
 /doc/automake*.1
 /doc/aclocal*.1
 /doc/stamp-vti
 /doc/version.texi
-/doc/automake*.ac
-/doc/automake*.aux
-/doc/automake*.cm
-/doc/automake*.cp
-/doc/automake*.cps
-/doc/automake*.dvi
-/doc/automake*.fn
-/doc/automake*.fns
-/doc/automake*.html
-/doc/automake*.ky
-/doc/automake*.log
-/doc/automake*.op
-/doc/automake*.pdf
-/doc/automake*.pg
-/doc/automake*.ps
-/doc/automake*.toc
-/doc/automake*.tp
-/doc/automake*.tr
-/doc/automake*.vr
-/doc/automake*.vrs
+/doc/amhello-*.tar.gz
 /doc/amhello/Makefile.in
 /doc/amhello/aclocal.m4
 /doc/amhello/config.h.in
diff --git a/Makefile.am b/Makefile.am
index 985e7da..3eae563 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,37 +17,33 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-## lib goes first, because it builds Config.pm, used by aclocal and
-## automake (run in doc, tests, and in the rebuild rules.)
-## '.' goes before doc and tests, because the latter two directories
-## run aclocal and automake.
-SUBDIRS = lib . contrib doc m4 tests
+## '.' goes before tests, because this latter directory runs
+## aclocal and automake.
+SUBDIRS = . tests
+
+## Might be updated later.
+CLEANFILES =
+DISTCLEANFILES =
+MAINTAINERCLEANFILES =
+EXTRA_DIST =
+
+## ------------ ##
+##  Top level.  ##
+## ------------ ##
 
 bin_SCRIPTS = automake aclocal
 
-CLEANFILES = $(bin_SCRIPTS)
+CLEANFILES += $(bin_SCRIPTS)
 AUTOMAKESOURCES = automake.in aclocal.in
 
 TAGS_FILES = $(AUTOMAKESOURCES)
 
-EXTRA_DIST = \
+EXTRA_DIST += \
   $(AUTOMAKESOURCES) \
   bootstrap \
   GNUmakefile \
   syntax-checks.mk \
-  HACKING \
-  $(gitlog_to_changelog_fixes) \
-  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
+  HACKING
 
 ## Make versioned links.  We only run the transform on the root name;
 ## then we make a versioned link with the transformed base name.  This
@@ -69,7 +65,6 @@ uninstall-hook:
          rm -f "$(DESTDIR)$(bindir)/$$fv"; \
        done
 
-
 ## 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.
@@ -114,11 +109,342 @@ recheck:
 maintainer-clean-local:
        rm -rf .autom4te.cache
 
-################################################################
-##
+
+## -------------------------------------------------------------------- ##
+##  Auxiliary scripts and files for use with "automake --add-missing".  ##
+## -------------------------------------------------------------------- ##
+
+dist_pkgvdata_DATA = \
+  lib/COPYING \
+  lib/INSTALL \
+  lib/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.
+dist_script_DATA = \
+  lib/config.guess \
+  lib/config.sub \
+  lib/install-sh \
+  lib/mdate-sh \
+  lib/missing \
+  lib/mkinstalldirs \
+  lib/elisp-comp \
+  lib/ylwrap \
+  lib/depcomp \
+  lib/compile \
+  lib/py-compile \
+  lib/ar-lib \
+  lib/test-driver \
+  lib/tap-driver.sh \
+  lib/tap-driver.pl
+
+install-data-hook:
+       @$(POST_INSTALL)
+       @for f in $(dist_script_DATA); do echo $$f; done \
+         | sed 's,^lib/,,' \
+         | ( st=0; \
+             while read f; do \
+               echo " chmod +x '$(DESTDIR)$(scriptdir)/$$f'"; \
+               chmod +x "$(DESTDIR)$(scriptdir)/$$f" || st=1; \
+             done; \
+             exit $$st )
+
+installcheck-local:
+       @for f in $(dist_script_DATA); do echo $$f; done \
+         | sed 's,^lib/,,' \
+         | while read f; do \
+             path="$(pkgvdatadir)/$$f"; \
+             test -x "$$path" || echo $$path; \
+           done \
+         | sed 's/$$/: not executable/' \
+         | grep . 1>&2 && exit 1; exit 0
+
+
+## ---------------------------------------------------- ##
+##  Private perl modules used by automake and aclocal.  ##
+## ---------------------------------------------------- ##
+
+perllibdir = $(pkgvdatadir)/Automake
+dist_perllib_DATA = \
+  lib/Automake/ChannelDefs.pm \
+  lib/Automake/Channels.pm \
+  lib/Automake/Condition.pm \
+  lib/Automake/Configure_ac.pm \
+  lib/Automake/DisjConditions.pm \
+  lib/Automake/FileUtils.pm \
+  lib/Automake/General.pm \
+  lib/Automake/Getopt.pm \
+  lib/Automake/Item.pm \
+  lib/Automake/ItemDef.pm \
+  lib/Automake/Location.pm \
+  lib/Automake/Options.pm \
+  lib/Automake/Rule.pm \
+  lib/Automake/RuleDef.pm \
+  lib/Automake/Variable.pm \
+  lib/Automake/VarDef.pm \
+  lib/Automake/Version.pm \
+  lib/Automake/XFile.pm \
+  lib/Automake/Wrap.pm
+
+nodist_perllib_DATA = lib/Automake/Config.pm
+CLEANFILES += $(nodist_perllib_DATA)
+
+## 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.
+lib/Automake/Config.pm: lib/Automake/Config.in Makefile
+       $(AM_V_at)rm -f $@ address@hidden
+       $(AM_V_at)test -d lib/Automake || $(MKDIR_P) lib/Automake
+       $(AM_V_GEN)sed <$(srcdir)/lib/Automake/Config.in >address@hidden \
+         -e 's,address@hidden@],$(APIVERSION),g' \
+         -e 's,address@hidden@],$(PACKAGE),g' \
+         -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
+         -e 's,address@hidden@],$(PERL),g' \
+         -e 's,address@hidden@],$(PERL_THREADS),g' \
+         -e 's,address@hidden@],$(SHELL),g' \
+         -e 's,address@hidden@],$(VERSION),g' \
+         -e "s,address@hidden@],Generated from Config.in; do not edit by 
hand.,g" \
+         -e 's,address@hidden@],$(datadir),g'
+       $(AM_V_at)chmod a-w address@hidden && mv -f address@hidden $@
+EXTRA_DIST += lib/Automake/Config.in
+
+
+## --------------------- ##
+##  Makefile fragments.  ##
+## --------------------- ##
+
+dist_am_DATA = \
+  lib/am/check.am \
+  lib/am/check2.am \
+  lib/am/clean-hdr.am \
+  lib/am/clean.am \
+  lib/am/compile.am \
+  lib/am/configure.am \
+  lib/am/data.am \
+  lib/am/dejagnu.am \
+  lib/am/depend.am \
+  lib/am/depend2.am \
+  lib/am/distdir.am \
+  lib/am/footer.am \
+  lib/am/header-vars.am \
+  lib/am/header.am \
+  lib/am/install.am \
+  lib/am/inst-vars.am \
+  lib/am/java.am \
+  lib/am/lang-compile.am \
+  lib/am/lex.am \
+  lib/am/library.am \
+  lib/am/libs.am \
+  lib/am/libtool.am \
+  lib/am/lisp.am \
+  lib/am/ltlib.am \
+  lib/am/ltlibrary.am \
+  lib/am/mans-vars.am \
+  lib/am/mans.am \
+  lib/am/program.am \
+  lib/am/progs.am \
+  lib/am/python.am \
+  lib/am/remake-hdr.am \
+  lib/am/scripts.am \
+  lib/am/subdirs.am \
+  lib/am/tags.am \
+  lib/am/texi-vers.am \
+  lib/am/texibuild.am \
+  lib/am/texinfos.am \
+  lib/am/vala.am \
+  lib/am/yacc.am
+
+
+## ------------------------------ ##
+##  Automake-provided m4 macros.  ##
+## ------------------------------ ##
+
+dist_automake_ac_DATA = \
+  m4/amversion.m4 \
+  m4/ar-lib.m4 \
+  m4/as.m4 \
+  m4/auxdir.m4 \
+  m4/ccstdc.m4 \
+  m4/cond.m4 \
+  m4/cond-if.m4 \
+  m4/depend.m4 \
+  m4/depout.m4 \
+  m4/dmalloc.m4 \
+  m4/gcj.m4 \
+  m4/header.m4 \
+  m4/init.m4 \
+  m4/install-sh.m4 \
+  m4/lead-dot.m4 \
+  m4/lex.m4 \
+  m4/lispdir.m4 \
+  m4/maintainer.m4 \
+  m4/make.m4 \
+  m4/minuso.m4 \
+  m4/missing.m4 \
+  m4/mkdirp.m4 \
+  m4/obsol-gt.m4 \
+  m4/obsol-lt.m4 \
+  m4/obsolete.m4 \
+  m4/options.m4 \
+  m4/protos.m4 \
+  m4/python.m4 \
+  m4/runlog.m4 \
+  m4/sanity.m4 \
+  m4/silent.m4 \
+  m4/strip.m4 \
+  m4/substnot.m4 \
+  m4/tar.m4 \
+  m4/upc.m4 \
+  m4/vala.m4
+
+dist_system_ac_DATA = m4/acdir/README
+
+# 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: $(srcdir)/configure.ac $(srcdir)/m4/amversion.in
+       $(AM_V_at)sed \
+           -e 's,address@hidden@],$(VERSION),g' \
+           -e 's,address@hidden@],$(APIVERSION),g' \
+           -e "s,address@hidden@],Generated from amversion.in; do not edit by 
hand.,g" \
+           $(srcdir)/m4/amversion.in > address@hidden
+       $(AM_V_at)chmod a-w address@hidden && mv -f address@hidden $@
+EXTRA_DIST += m4/amversion.in
+
+
+## ---------------- ##
+##  Documentation.  ##
+## ---------------- ##
+
+info_TEXINFOS = doc/automake.texi doc/automake-history.texi
+doc_automake_TEXINFOS = doc/fdl.texi
+doc_automake_history_TEXINFOS = doc/fdl.texi
+
+dist_man1_MANS = \
+  $(srcdir)/doc/aclocal.1 \
+  $(srcdir)/doc/automake.1 \
+  $(srcdir)/doc/aclocal-$(APIVERSION).1 \
+  $(srcdir)/doc/automake-$(APIVERSION).1
+
+$(dist_man1_MANS): $(srcdir)/configure.ac
+
+MAINTAINERCLEANFILES += $(dist_man1_MANS)
+
+update_mans = \
+  $(AM_V_GEN): \
+    && $(MAKE) $(AM_MAKEFLAGS) lib/Automake/Config.pm \
+    && PATH="$(abs_builddir)/tests/wrap$(PATH_SEPARATOR)$$PATH" \
+    && export PATH \
+    && $(HELP2MAN) --output=$@
+
+$(srcdir)/doc/aclocal.1 $(srcdir)/doc/automake.1:
+       $(AM_V_GEN): \
+         && f=`echo $@ | sed 's|.*/||; s|\.1$$||; $(transform)'` \
+         && echo ".so man1/$$f-$(APIVERSION).1" > $@
+
+$(srcdir)/doc/aclocal-$(APIVERSION).1: $(srcdir)/aclocal.in
+       $(update_mans) aclocal-$(APIVERSION)
+$(srcdir)/doc/automake-$(APIVERSION).1: $(srcdir)/automake.in
+       $(update_mans) automake-$(APIVERSION)
+
+
+## ---------------------------- ##
+##  Example package "amhello".  ##
+## ---------------------------- ##
+
+amhello_sources = \
+  doc/amhello/configure.ac \
+  doc/amhello/Makefile.am \
+  doc/amhello/README \
+  doc/amhello/src/main.c \
+  doc/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)/doc/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)/doc/amhello-1.0.tar.gz: $(amhello_sources) $(srcdir)/configure.ac
+       $(AM_V_GEN): \
+         && PATH="$(abs_top_builddir)/tests/wrap$(PATH_SEPARATOR)$$PATH" \
+         && export PATH \
+         && $(am__cd) $(srcdir)/doc/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 -f amhello-1.0.tar.gz ..
+
+
+## ------------------------------------------------- ##
+##  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
+
+
+##########################################################################
+
 ## Everything past here is useful to the maintainer, but probably not
-## to anybody else
-##
+## to anybody else.
+
+##########################################################################
+
+
+## --------------------------------------------------------- ##
+##  Automatic generation of the ChangeLog from git history.  ##
+## --------------------------------------------------------- ##
 
 gitlog_to_changelog_command = $(PERL) $(srcdir)/lib/gitlog-to-changelog
 gitlog_to_changelog_fixes = $(srcdir)/.git-log-fix
@@ -126,8 +452,9 @@ gitlog_to_changelog_options = 
--amend=$(gitlog_to_changelog_fixes) \
                               --since='2011-12-28 00:00:00' \
                               --no-cluster --format '%s%n%n%b'
 
-# Automatic generation of the ChangeLog from git history.
-#
+EXTRA_DIST += lib/gitlog-to-changelog
+EXTRA_DIST += $(gitlog_to_changelog_fixes)
+
 # When executed from a git checkout, generate the ChangeLog from the git
 # history.  When executed from an extracted distribution tarball, just
 # copy the distributed ChangeLog in the build directory (and if this
@@ -160,12 +487,16 @@ ChangeLog: am--changelog-regen-hook
          exit 1; \
        fi
 
-# Ensure tests are world-executable
+# Ensure tests are world-executable.
+# FIXME: this should be turned into a maintainer check...
 dist-hook:
        $(am__cd) $(distdir)/tests && chmod a+rx *.test
 
 
-# Perl coverage statistics.
+## --------------------------- ##
+##  Perl coverage statistics.  ##
+## --------------------------- ##
+
 PERL_COVERAGE_DB = $(abs_top_builddir)/cover_db
 PERL_COVERAGE_FLAGS = 
-MDevel::Cover=-db,$(PERL_COVERAGE_DB),-silent,on,-summary,off
 PERL_COVER = cover
@@ -199,10 +530,15 @@ clean-local: clean-coverage
 .PHONY: check-coverage recheck-coverage check-coverage-run \
        recheck-coverage-run check-coverage-report clean-coverage
 
-## Tagging and/or uploading stable and beta releases.
+
+## ---------------------------------------------------- ##
+##  Tagging and/or uploading stable and beta releases.  ##
+## ---------------------------------------------------- ##
 
 GIT = git
 
+EXTRA_DIST += lib/gnupload
+
 version_rx = ^[1-9][0-9]*\.[0-9][0-9]*(\.[0-9][0-9]*)?
 stable_version_rx = $(version_rx)$$
 beta_version_rx = $(version_rx)[bdfhjlnprtvxz]$$
@@ -260,6 +596,11 @@ git-upload-release:
 
 .PHONY: git-upload-release git-tag-release
 
+
+## ------------------------------------------------------------------ ##
+##  Explore differences of autogenerated files in different commits.  ##
+## ------------------------------------------------------------------ ##
+
 ## Visually comparing differences between the Makefile.in files in
 ## automake's own build system as generated in two different branches
 ## might help to catch bugs and blunders.  This has already happened a
@@ -296,6 +637,7 @@ autodiffs:
           && get_autofiles_from_rev $$OLD_COMMIT old \
           && get_autofiles_from_rev $$NEW_COMMIT new \
           && exit 0
+
 ## With lots of eye candy; we like our developers pampered and spoiled :-)
 compare-autodiffs: autodiffs
        @set -u; \
@@ -329,6 +671,11 @@ compare-autodiffs: autodiffs
        exit $$st
 .PHONY: autodiffs compare-autodiffs
 
+
+## --------------------------------------------------------------------- ##
+##  Synchronize third-party files that are committed in our repository.  ##
+## --------------------------------------------------------------------- ##
+
 ## Program to use to fetch files.
 WGET = wget
 WGET_SV_CVS = $(WGET) http://savannah.gnu.org/cgi-bin/viewcvs/~checkout~/
@@ -376,6 +723,13 @@ fetch:
        exit $$stat
 .PHONY: fetch
 
+
+## ------------------------------------------------ ##
+##  Update copyright years of all committed files.  ##
+## ------------------------------------------------ ##
+
+EXTRA_DIST += lib/update-copyright
+
 update_copyright_env = \
   UPDATE_COPYRIGHT_FORCE=1 \
   UPDATE_COPYRIGHT_USE_INTERVALS=2
diff --git a/configure.ac b/configure.ac
index e7b62e9..ae5163f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,14 +395,7 @@ AC_SUBST([EXEEXT])
 
 ###########################################################################
 
-AC_CONFIG_FILES([
-  Makefile
-  contrib/Makefile
-  doc/Makefile
-  lib/Makefile
-  m4/Makefile
-  tests/Makefile
-])
+AC_CONFIG_FILES([Makefile tests/Makefile])
 AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])
 AC_CONFIG_LINKS([tests/defs:tests/defs])
 AC_CONFIG_FILES([tests/wrap/aclocal-${APIVERSION}:tests/wrap/aclocal.in],
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
deleted file mode 100644
index 91c1cab..0000000
--- a/contrib/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-## Makefile for Automake contrib.
-
-# Copyright (C) 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/>.
-
-EXTRA_DIST = \
-  check-html.am \
-  multilib/README \
-  multilib/config-ml.in \
-  multilib/symlink-tree \
-  multilib/multilib.am \
-  multilib/multi.m4 \
-  README
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index ffd294d..0000000
--- 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='/address@hidden \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 ..
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index b7f23cd..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,162 +0,0 @@
-## Process this file with automake to create Makefile.in
-
-## Makefile for Automake lib.
-
-# Copyright (C) 2001-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/>.
-
-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
-
-## 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.
-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
-
-install-data-hook:
-       @$(POST_INSTALL)
-       @for prog in $(dist_script_DATA); do \
-         echo " chmod +x '$(DESTDIR)$(scriptdir)/$$prog'"; \
-         chmod +x "$(DESTDIR)$(scriptdir)/$$prog"; \
-       done
-
-installcheck-local:
-       @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/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,address@hidden@],$(APIVERSION),g' \
-  -e 's,address@hidden@],$(PACKAGE),g' \
-  -e 's,address@hidden@],$(PACKAGE_BUGREPORT),g' \
-  -e 's,address@hidden@],$(PERL),g' \
-  -e 's,address@hidden@],$(PERL_THREADS),g' \
-  -e 's,address@hidden@],$(SHELL),g' \
-  -e 's,address@hidden@],$(VERSION),g' \
-  -e "s,address@hidden@],Generated from $$in.in; do not edit by hand.,g" \
-  -e 's,address@hidden@],$(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 $@ address@hidden
-       $(AM_V_at)test -d Automake || mkdir Automake
-       $(AM_V_GEN)$(do_subst) $(srcdir)/Automake/Config.in >address@hidden
-       $(AM_V_at)chmod a-w address@hidden && mv -f address@hidden $@
-EXTRA_DIST += Automake/Config.in
-
-## --------------------- ##
-##  Makefile fragments.  ##
-## --------------------- ##
-
-dist_am_DATA = \
-  am/check.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/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
diff --git a/m4/Makefile.am b/m4/Makefile.am
deleted file mode 100644
index 572fca7..0000000
--- 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,address@hidden@],$(VERSION),g' \
-           -e 's,address@hidden@],$(APIVERSION),g' \
-           -e "s,address@hidden@],Generated from amversion.in; do not edit by 
hand.,g" \
-           $(srcdir)/amversion.in > address@hidden
-       @$(AM_V_at)chmod a-w address@hidden && mv -f address@hidden $@
-- 
1.7.9
[Prev in Thread]
Current Thread
[Next in Thread]
[PATCH] maint: remove most recursion in automake's own build system, Stefano Lattarini <=
- Re: [PATCH] maint: remove most recursion in automake's own build system, Jim Meyering, 2012/04/05
  - Re: [PATCH] maint: remove most recursion in automake's own build system, Stefano Lattarini, 2012/04/05
    - Re: [PATCH] maint: remove most recursion in automake's own build system, Jim Meyering, 2012/04/05
    - Re: [PATCH] maint: remove most recursion in automake's own build system, Stefano Lattarini, 2012/04/06
    - Re: [PATCH] maint: remove most recursion in automake's own build system, Jim Meyering, 2012/04/05
    - Re: [PATCH] maint: remove most recursion in automake's own build system, Stefano Lattarini, 2012/04/05
    - Re: [PATCH] maint: remove most recursion in automake's own build system, Stefano Lattarini, 2012/04/06
    - Re: [PATCH] maint: remove most recursion in automake's own build system, Jim Meyering, 2012/04/06
    - Re: [PATCH] maint: remove most recursion in automake's own build system, Stefano Lattarini, 2012/04/08
    - [PATCH 1/8] tests: move most helper scripts and files into the 'ax' subdirectory, Stefano Lattarini, 2012/04/08
Prev by Date: Re: bug#11034: Binutils, GDB, GCC and Automake's 'cygnus' option
Next by Date: [FYI] {master} tests: fix a spurious failures with non-GNU make
Previous by thread: Re: bug#11034: Binutils, GDB, GCC and Automake's 'cygnus' option
Next by thread: Re: [PATCH] maint: remove most recursion in automake's own build system
Index(es):
- Date
- Thread