Changeset 921 for trunk/src/gmakenew/file.c

Timestamp:

May 25, 2007, 5:27:53 AM (18 years ago)

Author:

bird

Message:

multi target explicit rules. partly done.

File:

• trunk/src/gmakenew/file.c (modified) (3 diffs)

trunk/src/gmakenew/file.c

@@ -778 +778 @@
   for (d = file->also_make; d != 0; d = d->next)
     d->file->command_state = state;
+
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  if (file->multi_head)
+    {
+      assert (file == file->multi_head);
+      for (file = file->multi_head; file != 0; file = file->multi_next)
+        file->command_state = state;
+    }
+#endif
 }
 
@@ -898 +907 @@
   if (!f->is_target)
     puts (_("# Not a target:"));
-  printf ("%s:%s", f->name, f->double_colon ? ":" : "");
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  if (f->multi_head)
+    {
+      const struct file *f2;
+      if (f->multi_head == f)
+        {
+          int multi_maybe = -1;
+          assert (!f->multi_maybe);
+          assert (!f->double_colon);
+
+          printf ("%s", f->name);
+          for (f2 = f->multi_next; f2 != 0; f2 = f2->multi_next)
+            {
+              printf (" %s%s", f2->multi_maybe != multi_maybe
+                      ? f2->multi_maybe ? "+| " : "+ " : "",
+                      f2->name);
+              multi_maybe = f2->multi_maybe;
+            }
+          putchar (':');
+        }
+      else
+        printf ("%s:%s", f->name, f->double_colon ? ":" : "");
+    }
+  else
+#endif
+    printf ("%s:%s", f->name, f->double_colon ? ":" : "");
 
   /* Print all normal dependencies; note any order-only deps.  */
@@ -917 +951 @@
 
   putchar ('\n');
+
+#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET
+  if (f->multi_head && f->multi_head != f)
+    {
+      const struct file *f2;
+      fputs (_("#  In multi target list:"), stdout);
+      for (f2 = f->multi_head; f2 != 0; f2 = f2->multi_next)
+        printf (" %s%s", f2->name, f == f2 ? "(*)" : "");
+      putchar ('\n');
+      if (f->multi_maybe)
+        puts (_("#  File is an optional multi target member."));
+    }
+#endif
 
   if (f->precious)