Changeset 520 for trunk/src/gmake/remake.c

Timestamp:

Sep 16, 2006, 6:56:25 AM (19 years ago)

Author:

bird

Message:

Cleaning up the modifications. Changes are now either configurable or marked, and dead stuff has been removed (dll shell).

File:

• trunk/src/gmake/remake.c (modified) (2 diffs)

trunk/src/gmake/remake.c

@@ -803 +803 @@
   int ran = file->command_state == cs_running;
   int touched = 0;
-  DB (DB_JOBS, (_("notice_finished_file - entering: file=%p `%s' update_status=%d command_state=%d\n"),
+  DB (DB_JOBS, (_("notice_finished_file - entering: file=%p `%s' update_status=%d command_state=%d\n"), /* bird */
                   file, file->name, file->update_status, file->command_state));
   file->command_state = cs_finished;
   file->updated = 1;
 
+#ifdef CONFIG_WITH_EXTENDED_NOTPARALLEL
   /* update not_parallel if the file was flagged for that. */
-  if (ran && (file->command_flags & (COMMANDS_NOTPARALLEL | COMMANDS_NO_COMMANDS))
-      == COMMANDS_NOTPARALLEL)
-    {
-      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s')\n"), not_parallel,
+  if (   ran 
+      && (file->command_flags & (COMMANDS_NOTPARALLEL | COMMANDS_NO_COMMANDS)) 
+         == COMMANDS_NOTPARALLEL)
+    {
+      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s') [notice_finished_file]\n"), not_parallel,
                    not_parallel - 1, file, file->name));
       assert(not_parallel >= 1);
       --not_parallel;
     }
+#endif
 
   if (touch_flag
@@ -936 +939 @@
        So mark it now as "succeeded".  */
     file->update_status = 0;
-
-DB (DB_JOBS, (_("notice_finished_file - leaving: file=%p `%s' update_status=%d command_state=%d\n"), file, file->name, file->update_status, file->command_state));
 }