Changeset 1020 in kBuild for trunk/src

Timestamp:

Jun 4, 2007 12:05:14 AM (18 years ago)

Author:

bird

Message:

no special casing for multi-maybe stuff. (it seems kind of unnecessary now)

File:

• trunk/src/kmk/remake.c (modified) (5 diffs)

trunk/src/kmk/remake.c

@@ -382 +382 @@
   struct file *dep_file;
 
-  /* Always work on the primary multi target file, unless of course, if it's
-     a multi-maybe file with its order only dependency on the primary file. */
+  /* Always work on the primary multi target file. */
   if (file->multi_head != NULL && file->multi_head != file)
     {
-      if (!file->multi_maybe)
-        {
-          DBS (DB_VERBOSE, (_("Considering target file `%s' -> switching to multi head `%s'.\n"), 
-                            file->name, file->multi_head->name));
-          file = file->multi_head;
-        }
-      else
-        DBF (DB_VERBOSE, _("Considering target file `%s'. (multi-maybe)\n"));
+      DBS (DB_VERBOSE, (_("Considering target file `%s' -> switching to multi head `%s'.\n"), 
+                          file->name, file->multi_head->name));
+      file = file->multi_head;
       /* XXX: optimize dependencies. */
     }
@@ -493 +487 @@
 
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-  for (dep_file = file; dep_file;
-       dep_file = file == file->multi_head ? dep_file->multi_next : NULL)
+  for (dep_file = file; dep_file; dep_file = dep_file->multi_next)
     {
       lastd = 0;
@@ -609 +602 @@
     {
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-      for (dep_file = file; dep_file;
-           dep_file = file == file->multi_head ? dep_file->multi_next : NULL)
+      for (dep_file = file; dep_file; dep_file = dep_file->multi_next)
         for (d = dep_file->deps; d != 0; d = d->next)
 #else
@@ -716 +708 @@
   deps_changed = 0;
 #ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-  for (dep_file = file; dep_file;
-       dep_file = file == file->multi_head ? dep_file->multi_next : NULL)
+  for (dep_file = file; dep_file; dep_file = dep_file->multi_next)
 #endif
     for (d = file->deps; d != 0; d = d->next)
@@ -782 +773 @@
   depth--;
 
-#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
-  /* maybe-update targets in a multi target should have been remade
-     by now, so return before we remake it again. */
-  if (file->multi_maybe)
-    {
-      assert (file->multi_head->updated);
-      assert (file->update_status <= 0);
-      DBF (DB_VERBOSE, _("Finished maybe-update file `%s'.\n"));
-      return 0;
-    }
-#endif
-
   if (file->double_colon && file->deps == 0)
     {