Fix a dependencies problem, stemming from a Autoconf 2.59 build

problem on QNX reported by Stephen Rasku in
<http://mail.gnu.org/archive/html/bug-autoconf/2004-02/msg00066.html>.

diff --git a/ChangeLog b/ChangeLog
index da9b7082b52ae5cab49c3a8cf32b1a5dd264d4c6..00ee2659a436de2faf882e60b20cf657ed80f07c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-02-18  Paul Eggert  <eggert@twinsun.com>
+
+       Fix a dependencies problem, stemming from a Autoconf 2.59 build
+       problem on QNX reported by Stephen Rasku in
+       <http://mail.gnu.org/archive/html/bug-autoconf/2004-02/msg00066.html>.
+
+       * bin/Makefile.am ($(srcdir)/autoconf.in): Depend on
+       $(m4sh_m4f_dependencies); this removes a FIXME.
+       * tests/Makefile.am ($(srcdir)/wrapper.in): Likewise.
+       (MAINTAINERCLEANFILES): Split into pieces,
+       one per related section.  Add $(srcdir)/wrapper.in.
+
 2004-02-09  Paul Eggert  <eggert@twinsun.com>
 
        * doc/autoconf.texi (Setting Output Variables): Emphasize that

diff --git a/bin/Makefile.am b/bin/Makefile.am
index c2527dd673a421b02b650f7d089bb36d1b75c2b5..c954a171bc502a469ec2136b128da2461e9d7192 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -54,7 +54,7 @@ edit = sed \
 
 # autoconf is written in M4sh.
 AUTOM4SH = $(top_builddir)/tests/autom4te --language M4sh --cache ''
-$(srcdir)/autoconf.in: $(srcdir)/autoconf.as # FIXME: $(m4sh_m4f_dependencies)
+$(srcdir)/autoconf.in: $(srcdir)/autoconf.as $(m4sh_m4f_dependencies)
        $(AUTOM4SH) $(srcdir)/autoconf.as -o $@
 
 ## All the files below depend on Makefile so that they are rebuilt

diff --git a/tests/Makefile.am b/tests/Makefile.am
index eb62c3f9762cd01fc51203b920fe8c617c7554cf..e367f45a1ca9c991ca62fdc06b127f16f98630dc 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,6 +27,7 @@ EXTRA_DIST = $(TESTSUITE_AT) local.at mktests.sh \
 check_SCRIPTS = autoconf autoheader autoreconf autom4te autoscan autoupdate ifnames
 
 DISTCLEANFILES = atconfig atlocal $(TESTSUITE) $(check_SCRIPTS)
+MAINTAINERCLEANFILES = Makefile.in 
 
 # Import the dependencies on Autotest and M4sh.
 include ../lib/freeze.mk
@@ -52,7 +53,9 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
 ## Wrappers.  ##
 ## ---------- ##
 
-$(srcdir)/wrapper.in: $(srcdir)/wrapper.as
+MAINTAINERCLEANFILES += $(srcdir)/wrapper.in
+
+$(srcdir)/wrapper.in: $(srcdir)/wrapper.as $(m4sh_m4f_dependencies)
        ./autom4te --language=M4sh $(srcdir)/wrapper.as -o $@
 
 
@@ -111,7 +114,7 @@ installcheck-local:
 ## Maintainer rules.  ##
 ## ------------------ ##
 
-MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE_GENERATED_AT)
+MAINTAINERCLEANFILES += $(TESTSUITE_GENERATED_AT)
 
 ## Producing the test files.