* automake.in (add_depend2): Handle the no-dependency-tracking

	case.  Fixes test suffix2.test.

diff --git a/ChangeLog b/ChangeLog
index 8c91109fcfc3f2a141b6de06b44c4923ece6d018..17bd33301a4097ceb90b1c2c11a9625227e6ab19 100644 (file)
--- 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 0053e9db2e72c0439a8069ecb035f301a3ddcbcf..2afc8c9000544812e6aaf8fb236d50036fbeeef3 100755 (executable)
--- 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];