* lib/am/depend.am (distclean-depend): Erase %DEPDIRS%, not $(DEPDIRS).

* automake.in (handle_languages): Compute and substitute %DEPDIRS%.
* tests/pr224.test: Make sure .deps subdirectories are
erased by distclean.

diff --git a/ChangeLog b/ChangeLog
index 01570a5efc2ca24108cedd52182a00c4d3a3b747..c12eb705d1de515bcf7e98b601e0a18b71436bc8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-23  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * lib/am/depend.am (distclean-depend): Erase %DEPDIRS%, not $(DEPDIRS).
+       * automake.in (handle_languages): Compute and substitute %DEPDIRS%.
+       * tests/pr224.test: Make sure .deps subdirectories are
+       erased by distclean.
+
 2002-01-22  Tom Tromey  <tromey@redhat.com>
 
        * m4/gcj.m4 (AM_PROG_GCJ): Don't invoke dependency code if
@@ -8,7 +15,7 @@
 
 2002-01-22  Pavel Roskin  <proski@gnu.org>
 
-       * tests/asm.test: Use CCAS and CCASFLAGS instead of AS and 
+       * tests/asm.test: Use CCAS and CCASFLAGS instead of AS and
        ASFLAGS.
 
 2002-01-22  Akim Demaille  <akim@epita.fr>

diff --git a/automake.in b/automake.in
index 7a313e3894b72486771309a658cc9e50e9f2e9ea..967b03a4f8b06f808f8572c499ba3aa28c4aecbc 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1573,7 +1573,10 @@ sub handle_languages
                                  . "\n");
            }
 
-           $output_rules .= &file_contents ('depend');
+           # Compute the set of directories to remove in distclean-depend.
+           my @depdirs = uniq (map { dirname ($_) } @deplist);
+           $output_rules .= &file_contents ('depend',
+                                            DEPDIRS => "@depdirs");
        }
     }
     else

diff --git a/lib/am/depend.am b/lib/am/depend.am
index d2c1186b15f51f001bbb85d789ddca7bc89a482d..7376bbdaaa77fdb20d7c27f7ce0ca62b13b1dc9c 100644 (file)
--- a/lib/am/depend.am
+++ b/lib/am/depend.am
@@ -19,6 +19,6 @@
 
 distclean-am: distclean-depend
 distclean-depend:
-       -rm -rf $(DEPDIR)
+       -rm -rf %DEPDIRS%
 
 .PHONY: distclean-depend

diff --git a/tests/pr224.test b/tests/pr224.test
index 5023fa82b9e6b9fa188fe62bf1cd16819c8893c9..c986c965e1ea49464795c6f8f73eab4ec78eaa7e 100755 (executable)
--- a/tests/pr224.test
+++ b/tests/pr224.test
@@ -41,3 +41,6 @@ CC='gcc' ../configure
 $MAKE
 
 test -d foo/.deps
+make distclean
+test -d foo/.deps && exit 1
+: