===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/gnode.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** src/usr.bin/make/gnode.h	2012/10/06 09:32:40	1.22
--- src/usr.bin/make/gnode.h	2012/10/09 19:45:34	1.23
***************
*** 1,6 ****
  #ifndef GNODE_H
  #define GNODE_H
! /*	$OpenBSD: gnode.h,v 1.22 2012/10/06 09:32:40 espie Exp $ */
  
  /*
   * Copyright (c) 2001 Marc Espie.
--- 1,6 ----
  #ifndef GNODE_H
  #define GNODE_H
! /*	$OpenBSD: gnode.h,v 1.23 2012/10/09 19:45:34 espie Exp $ */
  
  /*
   * Copyright (c) 2001 Marc Espie.
***************
*** 40,46 ****
  #include "symtable.h"
  #endif
  
- struct Suff_;
  /*-
   * The structure for an individual graph node. Each node has several
   * pieces of data associated with it.
--- 40,45 ----
***************
*** 80,85 ****
--- 79,85 ----
  #define ENDCYCLE	7
  #define NOSUCHNODE	8
  #define BUILDING	9
+ #define HELDBACK	10
  
  #define SPECIAL_NONE	0U
  #define SPECIAL_PATH		21U
***************
*** 90,95 ****
--- 90,96 ----
  
  #define	SPECIAL_EXEC		4U
  #define SPECIAL_IGNORE		5U
+ #define SPECIAL_NOTHING 	6U
  #define	SPECIAL_INVISIBLE	8U
  #define SPECIAL_JOIN		9U
  #define SPECIAL_MADE		11U
***************
*** 104,110 ****
  #define SPECIAL_PHONY		22U
  #define SPECIAL_PRECIOUS	23U
  #define SPECIAL_SILENT		25U
- #define SPECIAL_SINGLESHELL	26U
  #define SPECIAL_SUFFIXES	27U
  #define	SPECIAL_USE		28U
  #define SPECIAL_WAIT		29U
--- 105,110 ----
***************
*** 112,118 ****
  #define SPECIAL_ERROR		31U
  #define SPECIAL_CHEAP		32U
  #define SPECIAL_EXPENSIVE	33U
- #define SPECIAL_DEPRECATED 	6U
  
  struct GNode_ {
      unsigned int special_op;	/* special op to apply */
--- 112,117 ----
***************
*** 139,145 ****
  			 *	printed. Go back and unmark all its
  			 *	members.
  			 */
-     char build_lock;	/* for parallel build in siblings */
      char *path;		/* The full pathname of the file */
      unsigned int type;	/* Its type (see the OP flags, below) */
      int order;		/* Its wait weight */
--- 138,143 ----
***************
*** 159,171 ****
  
      SymTable context;	/* The local variables */
      LIST commands;	/* Creation commands */
!     struct Suff_ *suffix;/* Suffix for the node (determined by
  			 * Suff_FindDeps and opaque to everyone
  			 * but the Suff module) */
!     struct GNode_ *sibling;	/* equivalent targets */
      /* stuff for target name equivalence */
      char *basename;	/* pointer to name stripped of path */
!     struct GNode_ *next;
      char name[1];	/* The target's name */
  };
  
--- 157,171 ----
  
      SymTable context;	/* The local variables */
      LIST commands;	/* Creation commands */
!     Suff *suffix;	/* Suffix for the node (determined by
  			 * Suff_FindDeps and opaque to everyone
  			 * but the Suff module) */
!     GNode *sibling;	/* equivalent targets */
!     GNode *groupling;	/* target lists */
!     GNode *watched;	/* the node currently building */
      /* stuff for target name equivalence */
      char *basename;	/* pointer to name stripped of path */
!     GNode *next;
      char name[1];	/* The target's name */
  };
  
***************
*** 230,235 ****
--- 230,236 ----
  /* Attributes applied by PMake */
  #define OP_TRANSFORM	0x00040000  /* The node is a transformation rule */
  #define OP_MEMBER	0x00080000  /* Target is a member of an archive */
+ #define OP_DOUBLE	0x00100000  /* normal op with double commands */
  #define OP_ARCHV	0x00200000  /* Target is an archive construct */
  #define OP_HAS_COMMANDS 0x00400000  /* Target has all the commands it should.
  				     * Used when parsing to catch multiple