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

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/usr.bin/make/make.c between version 1.27 and 1.27.2.1

version 1.27, 2000/02/29 22:00:02 version 1.27.2.1, 2000/06/23 16:39:43
Line 102  static int   numNodes;    /* Number of n
Line 102  static int   numNodes;    /* Number of n
   
 static int MakeAddChild __P((ClientData, ClientData));  static int MakeAddChild __P((ClientData, ClientData));
 static int MakeFindChild __P((ClientData, ClientData));  static int MakeFindChild __P((ClientData, ClientData));
   static int MakeUnmark __P((ClientData, ClientData));
 static int MakeAddAllSrc __P((ClientData, ClientData));  static int MakeAddAllSrc __P((ClientData, ClientData));
 static int MakeTimeStamp __P((ClientData, ClientData));  static int MakeTimeStamp __P((ClientData, ClientData));
 static int MakeHandleUse __P((ClientData, ClientData));  static int MakeHandleUse __P((ClientData, ClientData));
Line 410  Make_HandleUse (cgn, pgn)
Line 411  Make_HandleUse (cgn, pgn)
                         gn = tgn;                          gn = tgn;
                 }                  }
   
                 if (Lst_Member (pgn->children, gn) == NILLNODE) {                  (void) Lst_AtEnd (pgn->children, gn);
                     (void) Lst_AtEnd (pgn->children, gn);                  (void) Lst_AtEnd (gn->parents, pgn);
                     (void) Lst_AtEnd (gn->parents, pgn);                  pgn->unmade += 1;
                     pgn->unmade += 1;  
                 }  
             }              }
             Lst_Close (cgn->children);              Lst_Close (cgn->children);
         }          }
Line 436  Make_HandleUse (cgn, pgn)
Line 435  Make_HandleUse (cgn, pgn)
     }      }
     return (0);      return (0);
 }  }
   
 static int  static int
 MakeHandleUse (pgn, cgn)  MakeHandleUse (cgnp, pgnp)
     ClientData pgn;     /* the current parent */      ClientData  cgnp;   /* the child we've just examined */
     ClientData cgn;     /* the child we've just examined */      ClientData  pgnp;   /* the current parent */
 {  {
     return Make_HandleUse((GNode *) pgn, (GNode *) cgn);      GNode       *cgn = (GNode *) cgnp;
       GNode       *pgn = (GNode *) pgnp;
   
       if (cgn->type & OP_MARK)
           return (0);
       cgn->type |= OP_MARK;
   
       return Make_HandleUse(cgn, pgn);
 }  }
   
   
Line 669  Make_Update (cgn)
Line 676  Make_Update (cgn)
  *-----------------------------------------------------------------------   *-----------------------------------------------------------------------
  */   */
 static int  static int
   MakeUnmark (cgnp, pgnp)
       ClientData  cgnp;
       ClientData  pgnp;
   {
       GNode       *cgn = (GNode *) cgnp;
   
       cgn->type &= ~OP_MARK;
       return (0);
   }
   
   static int
 MakeAddAllSrc (cgnp, pgnp)  MakeAddAllSrc (cgnp, pgnp)
     ClientData  cgnp;   /* The child to add */      ClientData  cgnp;   /* The child to add */
     ClientData  pgnp;   /* The parent to whose ALLSRC variable it should be */      ClientData  pgnp;   /* The parent to whose ALLSRC variable it should be */
Line 676  MakeAddAllSrc (cgnp, pgnp)
Line 694  MakeAddAllSrc (cgnp, pgnp)
 {  {
     GNode       *cgn = (GNode *) cgnp;      GNode       *cgn = (GNode *) cgnp;
     GNode       *pgn = (GNode *) pgnp;      GNode       *pgn = (GNode *) pgnp;
   
       if (cgn->type & OP_MARK)
           return (0);
       cgn->type |= OP_MARK;
   
     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;          char *p1 = NULL;
Line 742  void
Line 765  void
 Make_DoAllVar (gn)  Make_DoAllVar (gn)
     GNode       *gn;      GNode       *gn;
 {  {
       Lst_ForEach (gn->children, MakeUnmark, (ClientData) gn);
     Lst_ForEach (gn->children, MakeAddAllSrc, (ClientData) gn);      Lst_ForEach (gn->children, MakeAddAllSrc, (ClientData) gn);
   
     if (!Var_Exists (OODATE, gn)) {      if (!Var_Exists (OODATE, gn)) {
Line 968  Make_ExpandUse (targs)
Line 992  Make_ExpandUse (targs)
   
             (void)Dir_MTime(gn);              (void)Dir_MTime(gn);
             Var_Set (TARGET, gn->path ? gn->path : gn->name, gn);              Var_Set (TARGET, gn->path ? gn->path : gn->name, gn);
               Lst_ForEach (gn->children, MakeUnmark, (ClientData)gn);
             Lst_ForEach (gn->children, MakeHandleUse, (ClientData)gn);              Lst_ForEach (gn->children, MakeHandleUse, (ClientData)gn);
             Suff_FindDeps (gn);              Suff_FindDeps (gn);
   
Legend:
Removed from v.1.27  
changed lines
  Added in v.1.27.2.1
CVSweb <webmaster@jp.NetBSD.org>