* automake.in (lang_yacc_target_hook): Add $output to

@maintainer_clean_files.  This was lost on 2001-06-23.
* tests/yacc7.test, tests/yacc4.test: Complete to check
that maintainer-clean erases YACC's output files,
respectively with and without `-d'.
Reported by Flavien Astraud.

diff --git a/ChangeLog b/ChangeLog
index 69d3f2f03ec49ba9a1a489ef8436ad5bbf2fdc71..ebd48249a9cc7f410973f94d6d7ff762de0f8cab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-21  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (lang_yacc_target_hook): Add $output to
+       @maintainer_clean_files.  This was lost on 2001-06-23.
+       * tests/yacc7.test, tests/yacc4.test: Complete to check
+       that maintainer-clean erases YACC's output files,
+       respectively with and without `-d'.
+       Reported by Flavien Astraud.
+
 2002-06-19  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * lib/am/lang-compile.am (%FPFX%DEPMODE): Delete.  This is now

diff --git a/THANKS b/THANKS
index f7ffaf2712e9d1b99bc5c32a53dcfefbc3bdb4a3..13d1e8e3f28477c1ee599da6e6542d83cb9f94ff 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -52,6 +52,7 @@ Eric Magnien          emagnien@club-internet.fr
 Eric Siegerman         erics_97@pobox.com
 Erick Branderhorst     branderh@iaehv.nl
 Erik Lindahl           E.Lindahl@chem.rug.nl
+Flavien Astraud                flav42@yahoo.fr
 François Pinard                pinard@iro.umontreal.ca
 Fred Fish              fnf@ninemoons.com
 Ganesan Rajagopal      rganesan@novell.com

diff --git a/automake.in b/automake.in
index f639dc02453250aa49cfdfc46f2e3c2a61a30e4e..756ce9038e5505c9867bc7c36157f6ee61516d55 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -5115,6 +5115,9 @@ sub lang_yacc_target_hook
        # do.
        push (@maintainer_clean_files, $header);
     }
+    # Erase $OUTPUT on `make maintainer-clean' (by GNU standards).
+    # See the comment above for $HEADER.
+    push (@maintainer_clean_files, $output);
 }
 
 # This is a helper for both lex and yacc.

diff --git a/tests/yacc4.test b/tests/yacc4.test
index dcea3eda269ee0cc678c8161e45c327775332342..d2ab10722528fdb4bf48cd6f5bc45fb28321ed28 100755 (executable)
--- a/tests/yacc4.test
+++ b/tests/yacc4.test
@@ -63,4 +63,15 @@ $MAKE
 grep '^#.*/sub/\.\./' bar.c && exit 1
 grep '^#.*/sub/\.\./' parse.c && exit 1
 
+# Make distclean must not erase bar.c nor parse.c (by GNU standards) ...
+$MAKE distclean
+test -f bar.c
+test -f parse.c
+# ... but maintainer-clean should.
+../configure
+$MAKE maintainer-clean
+test ! -f bar.c
+test ! -f parse.c
+:
+
 exit 0

diff --git a/tests/yacc7.test b/tests/yacc7.test
index db4dd691ecbeaa2e8931777c75e96d9f8b480d30..66828fa7ee5c5460a46c87f954730c71b59a1064 100755 (executable)
--- a/tests/yacc7.test
+++ b/tests/yacc7.test
@@ -32,22 +32,36 @@ WORD: "up";
 %%
 END
 
-$ACLOCAL || exit 1
-$AUTOMAKE -a || exit 1
-$AUTOCONF || exit 1
-./configure || exit 1
+set -e
 
-$MAKE foo.h || exit 1
+$ACLOCAL
+$AUTOMAKE -a
+$AUTOCONF
+./configure
 
-test -f foo.h || exit 1
+$MAKE foo.h
+
+test -f foo.h
 
 rm -f foo.h foo.c
-$MAKE check-dist || exit 1
+$MAKE check-dist
 
 # We should be able to recover if foo.h is deleted.
 
-rm -f foo.h || exit 1
-$MAKE foo.h || exit 1
-test -f foo.h || exit 1
+rm -f foo.h
+$MAKE foo.h
+test -f foo.h
 
-exit 0
+# Make distclean must not erase foo.c nor foo.h (by GNU standards) ...
+$MAKE foo.c
+test -f foo.h
+test -f foo.c
+$MAKE distclean
+test -f foo.h
+test -f foo.c
+# ... but maintainer-clean should.
+./configure
+$MAKE maintainer-clean
+test ! -f foo.h
+test ! -f foo.c
+: