stamp and subdirectories

To me, looks like the stamp cleaning code hasn't been kept
synchronized with the code that create stamp files.

Is it ok to supress the warning about stamp-h in AC_OUTPUT?

2002-04-26  Alexandre Duret-Lutz  <duret_g@xxxxxxxx>

        Erase stamps from the Makefile that generates them.

        * automake.in (handle_configure): Append each used stamp to
        @distclean_config.  Don't warn about stamp-h in AC_OUTPUT, this
        file is not used anymore.
        * lib/am/clean.am (distclean-generic): Don't erase stamp-h and
        stamp-h[0-9]*.
        * tests/subdir6.test: New file.
        * tests/Makefile.am (TESTS): Add it.

Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1287.2.5
diff -u -r1.1287.2.5 automake.in
--- automake.in 25 Apr 2002 16:47:28 -0000      1.1287.2.5
+++ automake.in 26 Apr 2002 17:24:36 -0000
@@ -3998,7 +3998,7 @@
                              'CONFIG_H_PATH' => $config_h_path,
                              'STAMP'         => "$stamp"));
 
-           push @distclean_config, $cn_sans_dir;
+           push @distclean_config, $cn_sans_dir, $stamp;
        }
     }
 
@@ -4085,17 +4085,6 @@
            {
                next;
            }
-       }
-
-       # Some users have been tempted to put `stamp-h' in the
-       # AC_OUTPUT line.  This won't do the right thing, so we
-       # explicitly fail here.
-       if ($local eq 'stamp-h')
-       {
-           # FIXME: allow real filename.
-           file_error ($ac_config_files_location,
-                       'stamp-h should not appear in AC_OUTPUT');
-           next;
        }
 
        my @rewritten_inputs = rewrite_inputs_into_dependencies (1, @inputs);
Index: lib/am/clean.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/clean.am,v
retrieving revision 1.40
diff -u -r1.40 clean.am
--- lib/am/clean.am     17 May 2001 03:02:38 -0000      1.40
+++ lib/am/clean.am     26 Apr 2002 17:24:38 -0000
@@ -29,7 +29,7 @@
 
 distclean-am: distclean-generic clean-am
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+       -rm -f Makefile $(CONFIG_CLEAN_FILES)
 ?DISTCLEAN?    -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-am: maintainer-clean-generic distclean-am
Index: tests/Makefile.am
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.am,v
retrieving revision 1.385.2.6
diff -u -r1.385.2.6 Makefile.am
--- tests/Makefile.am   25 Apr 2002 07:55:52 -0000      1.385.2.6
+++ tests/Makefile.am   26 Apr 2002 17:24:38 -0000
@@ -312,6 +312,7 @@
 subdir3.test \
 subdir4.test \
 subdir5.test \
+subdir6.test \
 subdirbuiltsources.test \
 subdircond.test \
 subobj.test \
Index: tests/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/tests/Makefile.in,v
retrieving revision 1.499.2.9
diff -u -r1.499.2.9 Makefile.in
--- tests/Makefile.in   25 Apr 2002 07:55:53 -0000      1.499.2.9
+++ tests/Makefile.in   26 Apr 2002 17:24:39 -0000
@@ -388,6 +388,7 @@
 subdir3.test \
 subdir4.test \
 subdir5.test \
+subdir6.test \
 subdirbuiltsources.test \
 subdircond.test \
 subobj.test \
@@ -580,7 +581,7 @@
 clean-generic:
 
 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+       -rm -f Makefile $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
Index: tests/subdir6.test
===================================================================
RCS file: tests/subdir6.test
diff -N tests/subdir6.test
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ tests/subdir6.test  26 Apr 2002 17:24:39 -0000
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+# Test to make sure config headers in subdirectories are cleaned.
+
+. $srcdir/defs || exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AM_CONFIG_HEADER([sub/config.h:sub/config.hin])
+AC_OUTPUT
+END
+
+touch Makefile.am
+mkdir sub
+
+$ACLOCAL
+$AUTOCONF
+touch sub/config.hin
+$AUTOMAKE
+./configure
+test -f sub/stamp-h1
+$MAKE clean
+test -f sub/stamp-h1
+$MAKE distclean
+test -f sub/stamp-h1 && exit 1
+:

-- 
Alexandre Duret-Lutz