* aclocal.in (write_aclocal): Take an output file and list of

used macros in arguments and make up the file contents here.
(trace_used_macros): New function.
(add_file): Do not update $output.
($output): Delete.
(MAIN): Call trace_used_macros.  Then rewrite aclocal.m4 only
for these traced macros.  This should shorten aclocal.m4 by
stripping out unused macros.
* automake.texi (Invoking aclocal): Document ${AUTOM4TE}.
* tests/aclibobj.test: Make sure configure.in exists by the time
aclocal runs.
* tests/aclocal8.test: New file.
* tests/Makefile.am (TESTS): Add aclocal8.test.
Suggested by Bruno Haible and Akim Demaille.

4 files changed, 44 insertions, 19 deletions

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index b31d0c6fd..2f5196054 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -34,10 +34,15 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(dist_perllib_DATA) Makefile.am Makefile.in
 subdir = lib/Automake
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps =
+am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+	$(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \
+	$(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \
+	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/options.m4 \
+	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
+	$(top_srcdir)/m4/strip.m4
+DIST_COMMON = $(dist_perllib_DATA) $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -407,7 +412,7 @@ clean-generic:
 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -417,7 +422,7 @@ clean: clean-recursive
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
@@ -441,7 +446,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index bf201e9d9..a2d981776 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -33,10 +33,15 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = Makefile.am Makefile.in
 subdir = lib/Automake/tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps =
+am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+	$(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \
+	$(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \
+	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/options.m4 \
+	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
+	$(top_srcdir)/m4/strip.m4
+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -276,7 +281,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -286,6 +291,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+	-rm -f Makefile
 
 distclean-am: clean-am distclean-generic
 
@@ -310,6 +316,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/lib/Makefile.in b/lib/Makefile.in
index c2c6a16f2..9cf0e494f 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -34,13 +34,19 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(dist_pkgvdata_DATA) $(dist_script_DATA) COPYING \
-	INSTALL Makefile.am Makefile.in ansi2knr.1 ansi2knr.c compile \
-	config.guess config.sub depcomp elisp-comp install-sh mdate-sh \
-	missing mkinstalldirs py-compile texinfo.tex ylwrap
 subdir = lib
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps =
+am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+	$(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \
+	$(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \
+	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/options.m4 \
+	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
+	$(top_srcdir)/m4/strip.m4
+DIST_COMMON = $(dist_pkgvdata_DATA) $(dist_script_DATA) \
+	$(srcdir)/Makefile.in COPYING INSTALL Makefile.am ansi2knr.1 \
+	ansi2knr.c compile config.guess config.sub depcomp elisp-comp \
+	install-sh mdate-sh missing mkinstalldirs py-compile \
+	texinfo.tex ylwrap
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -381,7 +387,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -391,7 +397,7 @@ clean: clean-recursive
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-recursive
-
+	-rm -f Makefile
 distclean-am: clean-am distclean-generic distclean-tags
 
 dvi: dvi-recursive
@@ -417,7 +423,7 @@ install-man:
 installcheck-am: installcheck-local
 
 maintainer-clean: maintainer-clean-recursive
-
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 500326542..06241bb6a 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -34,10 +34,15 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-DIST_COMMON = $(dist_am_DATA) Makefile.am Makefile.in
 subdir = lib/am
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__configure_deps =
+am__configure_deps = $(top_srcdir)/m4/amversion.m4 \
+	$(top_srcdir)/m4/auxdir.m4 $(top_srcdir)/m4/init.m4 \
+	$(top_srcdir)/m4/install-sh.m4 $(top_srcdir)/m4/lead-dot.m4 \
+	$(top_srcdir)/m4/missing.m4 $(top_srcdir)/m4/options.m4 \
+	$(top_srcdir)/m4/runlog.m4 $(top_srcdir)/m4/sanity.m4 \
+	$(top_srcdir)/m4/strip.m4
+DIST_COMMON = $(dist_am_DATA) $(srcdir)/Makefile.in Makefile.am
 mkinstalldirs = $(SHELL) $(top_srcdir)/lib/mkinstalldirs
 CONFIG_CLEAN_FILES =
 SOURCES =
@@ -225,7 +230,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -235,6 +240,7 @@ clean: clean-am
 clean-am: clean-generic mostlyclean-am
 
 distclean: distclean-am
+	-rm -f Makefile
 
 distclean-am: clean-am distclean-generic
 
@@ -259,6 +265,7 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
 
 maintainer-clean-am: distclean-am maintainer-clean-generic