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

Diff for /src/usr.bin/make/make.c between version 1.13 and 1.14

version 1.13, 2000/02/02 13:47:48 version 1.14, 2000/03/26 16:21:32
Line 270 
Line 270 
      * thinking they're out-of-date.       * thinking they're out-of-date.
      */       */
     if (!oodate) {      if (!oodate) {
         Lst_ForEach (gn->parents, MakeTimeStamp, (ClientData)gn);          Lst_ForEach(gn->parents, MakeTimeStamp, gn);
     }      }
   
     return (oodate);      return (oodate);
Line 298 
Line 298 
     Lst            l = (Lst) lp;      Lst            l = (Lst) lp;
   
     if (!gn->make && !(gn->type & OP_USE)) {      if (!gn->make && !(gn->type & OP_USE)) {
         Lst_EnQueue(l, (ClientData)gn);          Lst_EnQueue(l, gn);
     }      }
     return (0);      return (0);
 }  }
Line 502 
Line 502 
                      * Queue the node up -- any unmade predecessors will                       * Queue the node up -- any unmade predecessors will
                      * be dealt with in MakeStartJobs.                       * be dealt with in MakeStartJobs.
                      */                       */
                     (void)Lst_EnQueue (toBeMade, (ClientData)pgn);                      Lst_EnQueue(toBeMade, pgn);
                 } else if (pgn->unmade < 0) {                  } else if (pgn->unmade < 0) {
                     Error ("Graph cycles through %s", pgn->name);                      Error ("Graph cycles through %s", pgn->name);
                 }                  }
Line 520 
Line 520 
         GNode   *succ = (GNode *)Lst_Datum(ln);          GNode   *succ = (GNode *)Lst_Datum(ln);
   
         if (succ->make && succ->unmade == 0 && succ->made == UNMADE &&          if (succ->make && succ->unmade == 0 && succ->made == UNMADE &&
             Lst_Member(toBeMade, (ClientData)succ) == NULL)              Lst_Member(toBeMade, succ) == NULL)
         {          {
             Lst_EnQueue(toBeMade, (ClientData)succ);              Lst_EnQueue(toBeMade, succ);
         }          }
     }      }
   
Line 639 
Line 639 
 Make_DoAllVar (gn)  Make_DoAllVar (gn)
     GNode       *gn;      GNode       *gn;
 {  {
     Lst_ForEach (gn->children, MakeAddAllSrc, (ClientData) gn);      Lst_ForEach(gn->children, MakeAddAllSrc, gn);
   
     if (!Var_Exists (OODATE, gn)) {      if (!Var_Exists (OODATE, gn)) {
         Var_Set (OODATE, "", gn);          Var_Set (OODATE, "", gn);
Line 778 
Line 778 
             if (gn->made == CYCLE) {              if (gn->made == CYCLE) {
                 Error("Graph cycles through `%s'", gn->name);                  Error("Graph cycles through `%s'", gn->name);
                 gn->made = ENDCYCLE;                  gn->made = ENDCYCLE;
                 Lst_ForEach(gn->children, MakePrintStatus, (ClientData) &t);                  Lst_ForEach(gn->children, MakePrintStatus, &t);
                 gn->made = UNMADE;                  gn->made = UNMADE;
             } else if (gn->made != ENDCYCLE) {              } else if (gn->made != ENDCYCLE) {
                 gn->made = CYCLE;                  gn->made = CYCLE;
                 Lst_ForEach(gn->children, MakePrintStatus, (ClientData) &t);                  Lst_ForEach(gn->children, MakePrintStatus, &t);
             }              }
         } else {          } else {
             printf ("`%s' not remade because of errors.\n", gn->name);              printf ("`%s' not remade because of errors.\n", gn->name);
Line 844 
Line 844 
              * Apply any .USE rules before looking for implicit dependencies               * Apply any .USE rules before looking for implicit dependencies
              * to make sure everything has commands that should...               * to make sure everything has commands that should...
              */               */
             Lst_ForEach (gn->children, MakeHandleUse, (ClientData)gn);              Lst_ForEach (gn->children, MakeHandleUse, gn);
             Suff_FindDeps (gn);              Suff_FindDeps (gn);
   
             if (gn->unmade != 0) {              if (gn->unmade != 0) {
                 Lst_ForEach (gn->children, MakeAddChild, (ClientData)examine);                  Lst_ForEach (gn->children, MakeAddChild, examine);
             } else {              } else {
                 Lst_EnQueue(toBeMade, (ClientData)gn);                  Lst_EnQueue(toBeMade, gn);
             }              }
         }          }
     }      }
Line 898 
Line 898 
      * because some inferior reported an error.       * because some inferior reported an error.
      */       */
     errors = ((errors == 0) && (numNodes != 0));      errors = ((errors == 0) && (numNodes != 0));
     Lst_ForEach(targs, MakePrintStatus, (ClientData) &errors);      Lst_ForEach(targs, MakePrintStatus, &errors);
   
     return (TRUE);      return (TRUE);
 }  }
Legend:
Removed from v.1.13  
changed lines
  Added in v.1.14