From: Tom Tromey <tromey@redhat.com>
Date: Tue, 14 Dec 1999 04:49:06 +0000 (+0000)
Subject: 	* automake.in (add_depend2): Handle the no-dependency-tracking
X-Git-Tag: Release-1-4b~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=169977c59d04ed52a06fb087462cfb4f5ea1b5c0;p=thirdparty%2Fautomake.git

	* automake.in (add_depend2): Handle the no-dependency-tracking
	case.  Fixes test suffix2.test.
---

diff --git a/ChangeLog b/ChangeLog
index 8c91109fc..17bd33301 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-12-13  Tom Tromey  <tromey@cygnus.com>
 
+	* automake.in (add_depend2): Handle the no-dependency-tracking
+	case.  Fixes test suffix2.test.
+
 	* depcomp (tmpdepfile): [case sgi] Added missing `fi'.
 
 	* automake.in (get_object_extension): Fixed quoting on
diff --git a/automake.in b/automake.in
index 0053e9db2..2afc8c900 100755
--- a/automake.in
+++ b/automake.in
@@ -2869,18 +2869,24 @@ sub add_depend2
 	      . ($seen_objext ? 's/^OBJEXT//;' : 's/^OBJEXT.*$//;')
 	      . ($seen_libtool ? 's/^LIBTOOL//;' : 's/^LIBTOOL.*$//;'));
 
-    local ($xform1) = ($xform
-		       . 's/\@BASE\@/\$\*/g;'
-		       . 's/\@SOURCE\@/\$\</g;'
-		       . 's/\@(LT|OBJ)?OBJ\@/\$\@/g;');
-
-    foreach $ext (&lang_extensions ($lang))
+    # This function can be called even when we don't want dependency
+    # tracking.  This happens when we need an explicit rule for some
+    # target.  In this case we don't want to include the generic code.
+    if ($use_dependencies)
     {
-	$output_rules .= (&file_contents_with_transform ('s/\@EXT\@/'
-							 . $ext . '/g;'
-							 . $xform1,
-							 'depend2')
-			  . "\n");
+	local ($xform1) = ($xform
+			   . 's/\@BASE\@/\$\*/g;'
+			   . 's/\@SOURCE\@/\$\</g;'
+			   . 's/\@(LT|OBJ)?OBJ\@/\$\@/g;');
+
+	foreach $ext (&lang_extensions ($lang))
+	{
+	    $output_rules .= (&file_contents_with_transform ('s/\@EXT\@/'
+							     . $ext . '/g;'
+							     . $xform1,
+							     'depend2')
+			      . "\n");
+	}
     }
 
     # Now include code for each specially handled object with this
@@ -2889,6 +2895,13 @@ sub add_depend2
     local ($max) = scalar @list;
     local ($i) = 0;
     local ($derived, $source, $obj);
+
+    # If dependency tracking is disabled, we just elide the code.
+    if (! $use_dependencies)
+    {
+	$xform .= 's/\@AMDEP\@.*$//;';
+    }
+
     while ($i < $max)
     {
 	$derived = $list[$i];