FYI: patch for: Re: `make distclean' does not remove the subdir/.deps directories

[Alexandre Duret-Lutz]

>>> "adl" == Alexandre Duret-Lutz <address@hidden> writes:

 adl> ... as a consequence `make distcheck' fails for all projects
 adl> using subdir sources.

 adl> I can see that lib/am/depend.am is outdated wrt to the recent
 adl> changes for pr224.

Here is a fix.  I'll commit it once `make check' has finished.

Index: ChangeLog
===================================================================
RCS file: /cvs/automake/automake/ChangeLog,v
retrieving revision 1.1748
diff -u -r1.1748 ChangeLog
--- ChangeLog   2002/01/22 18:52:23     1.1748
+++ ChangeLog   2002/01/23 19:41:21
@@ -1,3 +1,10 @@
+2002-01-23  Alexandre Duret-Lutz  <address@hidden>
+
+       * lib/am/depend.am (distclean-depend): Erase %DEPDIRS%, not $(DEPDIR).
+       * automake.in (handle_languages): Compute and substitute %DEPDIRS%.
+       * tests/pr224.test: Make sure .deps subdirectories are
+       erased by distclean.
+
 2002-01-22  Tom Tromey  <address@hidden>

        * m4/gcj.m4 (AM_PROG_GCJ): Don't invoke dependency code if
Index: lib/am/depend.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/depend.am,v
retrieving revision 1.35
diff -u -r1.35 depend.am
--- depend.am   2001/02/06 09:09:36     1.35
+++ depend.am   2002/01/23 19:41:45
@@ -19,6 +19,6 @@

 distclean-am: distclean-depend
 distclean-depend:
-       -rm -rf $(DEPDIR)
+       -rm -rf %DEPDIRS%

 .PHONY: distclean-depend
Index: automake.in
===================================================================
RCS file: /cvs/automake/automake/automake.in,v
retrieving revision 1.1273
diff -u -r1.1273 automake.in
--- automake.in 2002/01/22 00:11:27     1.1273
+++ automake.in 2002/01/23 20:05:29
@@ -1573,7 +1573,10 @@
                                  . "\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
Index: tests/pr224.test
===================================================================
RCS file: /cvs/automake/automake/tests/pr224.test,v
retrieving revision 1.1
diff -u -r1.1 pr224.test
--- pr224.test  2002/01/20 21:30:21     1.1
+++ pr224.test  2002/01/23 19:41:46
@@ -41,3 +41,6 @@
 $MAKE

 test -d foo/.deps
+make distclean
+test -d foo/.deps && exit 1
+:

--
Alexandre Duret-Lutz