From 9a1e42148a364910b0a162133c5d1e7683d2d5ae Mon Sep 17 00:00:00 2001
From: Akim Demaille <demaille@gostai.com>
Date: Tue, 23 Sep 2008 14:48:11 +0200
Subject: [PATCH] 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.
---
 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 a5cd3b97..bbdeb2d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-11-15  Akim Demaille  <demaille@gostai.com>
+
+	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  <demaille@gostai.com>
 
 	Provide convenience constructors for locations and positions.
diff --git a/Makefile.am b/Makefile.am
index 932c3bbf..90bef28a 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 2facd9df..00000000
--- 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 00000000..d3cb8317
--- /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 c5510f22..496f6e83 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
-- 
2.45.2