[PATCH] Remove build-aux/Makefile.am.

[Akim Demaille]

Recursive Makefiles are really way too slow, let's get rid of some of
them.

        * build-aux/Makefile.am: Rename as...
        * build-aux/local.mk: this.
        Adjust paths.
        * Makefile.am, configure.ac: Adjust.
---
 ChangeLog             |   11 +++++++++++
 Makefile.am           |    3 ++-
 build-aux/Makefile.am |    2 --
 build-aux/local.mk    |    3 +++
 configure.ac          |    1 -
 5 files changed, 16 insertions(+), 4 deletions(-)
 delete mode 100644 build-aux/Makefile.am
 create mode 100644 build-aux/local.mk

diff --git a/ChangeLog b/ChangeLog
index a5cd3b9..bbdeb2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2008-11-15  Akim Demaille  <address@hidden>
 
+       Remove build-aux/Makefile.am.
+       Recursive Makefiles are really way too slow, let's get rid of some of
+       them.
+       
+       * build-aux/Makefile.am: Rename as...
+       * build-aux/local.mk: this.
+       Adjust paths.
+       * Makefile.am, configure.ac: Adjust.
+
+2008-11-15  Akim Demaille  <address@hidden>
+
        Provide convenience constructors for locations and positions.
        * data/location.cc (position::position): Accept file, line and
        column as arguments with default values.
diff --git a/Makefile.am b/Makefile.am
index 932c3bb..90bef28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = build-aux po runtime-po lib data src doc examples tests etc
+SUBDIRS = po runtime-po lib data src doc examples tests etc
 
 # Files installed for use by Automake.
 aclocaldir = @aclocaldir@
@@ -30,6 +30,7 @@ EXTRA_DIST = .prev-version .version cfg.mk maint.mk \
   djgpp/subpipe.c djgpp/subpipe.h djgpp/djunpack.bat \
   djgpp/fnchange.lst djgpp/testsuite.sed
 
+include build-aux/local.mk
 
 .PHONY: maintainer-check
 maintainer-check:
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
deleted file mode 100644
index 2facd9d..0000000
--- a/build-aux/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-
-EXTRA_DIST = prev-version.txt cross-options.pl
diff --git a/build-aux/local.mk b/build-aux/local.mk
new file mode 100644
index 0000000..d3cb831
--- /dev/null
+++ b/build-aux/local.mk
@@ -0,0 +1,3 @@
+EXTRA_DIST +=                                  \
+build-aux/prev-version.txt                     \
+build-aux/cross-options.pl
diff --git a/configure.ac b/configure.ac
index c5510f2..496f6e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -149,7 +149,6 @@ gt_JAVACOMP([1.3], [1.4])
 gt_JAVAEXEC
 
 AC_CONFIG_FILES([Makefile
-                build-aux/Makefile
                 po/Makefile.in
                 data/Makefile
                 etc/Makefile
-- 
1.6.0.2.588.g3102