[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.7 and 1.8

version 1.7, 1998/12/05 00:06:28 version 1.8, 1999/12/06 22:28:44
Line 411 
Line 411 
     register GNode      *pgn;   /* the parent node */      register GNode      *pgn;   /* the parent node */
     register char       *cname; /* the child's name */      register char       *cname; /* the child's name */
     register LstNode    ln;     /* Element in parents and iParents lists */      register LstNode    ln;     /* Element in parents and iParents lists */
     char *p1;  
   
     cname = Var_Value (TARGET, cgn, &p1);      cname = Var_Value(TARGET, cgn);
     efree(p1);  
   
     /*      /*
      * If the child was actually made, see what its modification time is       * If the child was actually made, see what its modification time is
Line 533 
Line 531 
      * of this node.       * of this node.
      */       */
     if (Lst_Open (cgn->iParents) == SUCCESS) {      if (Lst_Open (cgn->iParents) == SUCCESS) {
         char    *p1;          char    *cpref = Var_Value(PREFIX, cgn);
         char    *cpref = Var_Value(PREFIX, cgn, &p1);  
   
         while ((ln = Lst_Next (cgn->iParents)) != NILLNODE) {          while ((ln = Lst_Next (cgn->iParents)) != NILLNODE) {
             pgn = (GNode *)Lst_Datum (ln);              pgn = (GNode *)Lst_Datum (ln);
Line 543 
Line 540 
                 Var_Set (PREFIX, cpref, pgn);                  Var_Set (PREFIX, cpref, pgn);
             }              }
         }          }
         efree(p1);  
         Lst_Close (cgn->iParents);          Lst_Close (cgn->iParents);
     }      }
 }  }
Line 578 
Line 574 
     GNode       *pgn = (GNode *) pgnp;      GNode       *pgn = (GNode *) pgnp;
     if ((cgn->type & (OP_EXEC|OP_USE|OP_INVISIBLE)) == 0) {      if ((cgn->type & (OP_EXEC|OP_USE|OP_INVISIBLE)) == 0) {
         char *child;          char *child;
         char *p1 = NULL;  
   
         if (OP_NOP(cgn->type) ||          if (OP_NOP(cgn->type) ||
             (child = Var_Value(TARGET, cgn, &p1)) == NULL) {              (child = Var_Value(TARGET, cgn)) == NULL) {
             /*              /*
              * this node is only source; use the specific pathname for it               * this node is only source; use the specific pathname for it
              */               */
Line 614 
Line 609 
              */               */
             Var_Append(OODATE, child, pgn);              Var_Append(OODATE, child, pgn);
         }          }
         efree(p1);  
     }      }
     return (0);      return (0);
 }  }
Line 654 
Line 648 
         Var_Set (ALLSRC, "", gn);          Var_Set (ALLSRC, "", gn);
     }      }
   
     if (gn->type & OP_JOIN) {      if (gn->type & OP_JOIN)
         char *p1;          Var_Set(TARGET, Var_Value(ALLSRC, gn), gn);
         Var_Set (TARGET, Var_Value (ALLSRC, gn, &p1), gn);  
         efree(p1);  
     }  
 }  }
   
 /*-  /*-
Legend:
Removed from v.1.7  
changed lines
  Added in v.1.8