From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Wed, 23 Jan 2002 20:53:28 +0000 (+0000)
Subject: * lib/am/depend.am (distclean-depend): Erase %DEPDIRS%, not $(DEPDIRS).
X-Git-Tag: Release-1-5d~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aad17978e19449c8e01d488fb12f2ebad2931d5;p=thirdparty%2Fautomake.git

* 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 01570a5ef..c12eb705d 100644
--- 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 7a313e389..967b03a4f 100755
--- 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 d2c1186b1..7376bbdaa 100644
--- 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 5023fa82b..c986c965e 100755
--- 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
+: