===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/engine.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -c -r1.57 -r1.58
*** src/usr.bin/make/engine.c	2019/12/21 15:28:16	1.57
--- src/usr.bin/make/engine.c	2019/12/21 15:29:25	1.58
***************
*** 1,4 ****
! /*	$OpenBSD: engine.c,v 1.57 2019/12/21 15:28:16 espie Exp $ */
  /*
   * Copyright (c) 2012 Marc Espie.
   *
--- 1,4 ----
! /*	$OpenBSD: engine.c,v 1.58 2019/12/21 15:29:25 espie Exp $ */
  /*
   * Copyright (c) 2012 Marc Espie.
   *
***************
*** 289,295 ****
  	GNode	*gn;	/* A child of the .USE node */
  	LstNode	ln;	/* An element in the children list */
  
- 
  	assert(cgn->type & (OP_USE|OP_TRANSFORM));
  
  	if (pgn == NULL)
--- 289,294 ----
***************
*** 308,314 ****
  
  		if (Lst_AddNew(&pgn->children, gn)) {
  			Lst_AtEnd(&gn->parents, pgn);
! 			pgn->unmade++;
  		}
  	}
  
--- 307,313 ----
  
  		if (Lst_AddNew(&pgn->children, gn)) {
  			Lst_AtEnd(&gn->parents, pgn);
! 			pgn->children_left++;
  		}
  	}
  
***************
*** 320,333 ****
  	pgn->type |= cgn->type & ~(OP_OPMASK|OP_USE|OP_TRANSFORM|OP_DOUBLE);
  
  	/*
! 	 * This child node is now "made", so we decrement the count of
! 	 * unmade children in the parent... We also remove the child
  	 * from the parent's list to accurately reflect the number of
! 	 * decent children the parent has. This is used by Make_Run to
  	 * decide whether to queue the parent or examine its children...
  	 */
  	if (cgn->type & OP_USE)
! 		pgn->unmade--;
  }
  
  void
--- 319,332 ----
  	pgn->type |= cgn->type & ~(OP_OPMASK|OP_USE|OP_TRANSFORM|OP_DOUBLE);
  
  	/*
! 	 * This child node is now built, so we decrement the count of
! 	 * not yet built children in the parent... We also remove the child
  	 * from the parent's list to accurately reflect the number of
! 	 * remaining children the parent has. This is used by Make_Run to
  	 * decide whether to queue the parent or examine its children...
  	 */
  	if (cgn->type & OP_USE)
! 		pgn->children_left--;
  }
  
  void
***************
*** 447,453 ****
  	}
  
  	/*
! 	 * A target is remade in one of the following circumstances:
  	 * - its modification time is smaller than that of its youngest child
  	 *   and it would actually be run (has commands or type OP_NOP)
  	 * - it's the object of a force operator
--- 446,452 ----
  	}
  
  	/*
! 	 * A target is rebuilt in one of the following circumstances:
  	 * - its modification time is smaller than that of its youngest child
  	 *   and it would actually be run (has commands or type OP_NOP)
  	 * - it's the object of a force operator
***************
*** 470,476 ****
  		 */
  		if (DEBUG(MAKE))
  			printf(".JOIN node...");
! 		oodate = gn->childMade;
  	} else if (gn->type & (OP_FORCE|OP_EXEC|OP_PHONY)) {
  		/*
  		 * A node which is the object of the force (!) operator or which
--- 469,475 ----
  		 */
  		if (DEBUG(MAKE))
  			printf(".JOIN node...");
! 		oodate = gn->child_rebuilt;
  	} else if (gn->type & (OP_FORCE|OP_EXEC|OP_PHONY)) {
  		/*
  		 * A node which is the object of the force (!) operator or which