[BACK]Return to engine.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/engine.c between version 1.57 and 1.58

version 1.57, 2019/12/21 15:28:16 version 1.58, 2019/12/21 15:29:25
Line 289 
Line 289 
         GNode   *gn;    /* A child of the .USE node */          GNode   *gn;    /* A child of the .USE node */
         LstNode ln;     /* An element in the children list */          LstNode ln;     /* An element in the children list */
   
   
         assert(cgn->type & (OP_USE|OP_TRANSFORM));          assert(cgn->type & (OP_USE|OP_TRANSFORM));
   
         if (pgn == NULL)          if (pgn == NULL)
Line 308 
Line 307 
   
                 if (Lst_AddNew(&pgn->children, gn)) {                  if (Lst_AddNew(&pgn->children, gn)) {
                         Lst_AtEnd(&gn->parents, pgn);                          Lst_AtEnd(&gn->parents, pgn);
                         pgn->unmade++;                          pgn->children_left++;
                 }                  }
         }          }
   
Line 320 
Line 319 
         pgn->type |= cgn->type & ~(OP_OPMASK|OP_USE|OP_TRANSFORM|OP_DOUBLE);          pgn->type |= cgn->type & ~(OP_OPMASK|OP_USE|OP_TRANSFORM|OP_DOUBLE);
   
         /*          /*
          * This child node is now "made", so we decrement the count of           * This child node is now built, so we decrement the count of
          * unmade children in the parent... We also remove the child           * not yet built children in the parent... We also remove the child
          * from the parent's list to accurately reflect the number of           * from the parent's list to accurately reflect the number of
          * decent children the parent has. This is used by Make_Run to           * remaining children the parent has. This is used by Make_Run to
          * decide whether to queue the parent or examine its children...           * decide whether to queue the parent or examine its children...
          */           */
         if (cgn->type & OP_USE)          if (cgn->type & OP_USE)
                 pgn->unmade--;                  pgn->children_left--;
 }  }
   
 void  void
Line 447 
Line 446 
         }          }
   
         /*          /*
          * A target is remade in one of the following circumstances:           * A target is rebuilt in one of the following circumstances:
          * - its modification time is smaller than that of its youngest child           * - its modification time is smaller than that of its youngest child
          *   and it would actually be run (has commands or type OP_NOP)           *   and it would actually be run (has commands or type OP_NOP)
          * - it's the object of a force operator           * - it's the object of a force operator
Line 470 
Line 469 
                  */                   */
                 if (DEBUG(MAKE))                  if (DEBUG(MAKE))
                         printf(".JOIN node...");                          printf(".JOIN node...");
                 oodate = gn->childMade;                  oodate = gn->child_rebuilt;
         } else if (gn->type & (OP_FORCE|OP_EXEC|OP_PHONY)) {          } else if (gn->type & (OP_FORCE|OP_EXEC|OP_PHONY)) {
                 /*                  /*
                  * A node which is the object of the force (!) operator or which                   * A node which is the object of the force (!) operator or which
Legend:
Removed from v.1.57  
changed lines
  Added in v.1.58