===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/make/main.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -c -r1.84 -r1.85
*** src/usr.bin/make/main.c	2007/09/18 07:45:25	1.84
--- src/usr.bin/make/main.c	2007/09/23 09:44:39	1.85
***************
*** 1,5 ****
  /*	$OpenPackages$ */
! /*	$OpenBSD: main.c,v 1.84 2007/09/18 07:45:25 espie Exp $ */
  /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
  
  /*
--- 1,5 ----
  /*	$OpenPackages$ */
! /*	$OpenBSD: main.c,v 1.85 2007/09/23 09:44:39 espie Exp $ */
  /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
  
  /*
***************
*** 75,83 ****
  # endif
  #endif
  
- #ifndef DEFMAXLOCAL
- #define DEFMAXLOCAL DEFMAXJOBS
- #endif	/* DEFMAXLOCAL */
  
  #define MAKEFLAGS	".MAKEFLAGS"
  
--- 75,80 ----
***************
*** 89,95 ****
  static LIST		makefiles;	/* ordered list of makefiles to read */
  static LIST		varstoprint;	/* list of variables to print */
  int			maxJobs;	/* -j argument */
- static int		maxLocal;	/* -L argument */
  bool 		compatMake;	/* -B argument */
  int 		debug;		/* -d flag */
  bool 		noExecute;	/* -n flag */
--- 86,91 ----
***************
*** 300,306 ****
  					optarg);
  				usage();
  			}
- 			maxLocal = maxJobs;
  			record_option(c, optarg);
  			break;
  		}
--- 296,301 ----
***************
*** 676,683 ****
  	touchFlag = false;		/* Actually update targets */
  	debug = 0;			/* No debug verbosity, please. */
  
! 	maxLocal = DEFMAXLOCAL; 	/* Set default local max concurrency */
! 	maxJobs = maxLocal;
  	compatMake = false;		/* No compat mode */
  
  
--- 671,677 ----
  	touchFlag = false;		/* Actually update targets */
  	debug = 0;			/* No debug verbosity, please. */
  
! 	maxJobs = DEFMAXJOBS;
  	compatMake = false;		/* No compat mode */
  
  
***************
*** 786,796 ****
  			 * read. This is done only if the -q flag wasn't given
  			 * (to prevent the .BEGIN from being executed should
  			 * it exist).  */
! 			if (!queryFlag) {
! 				if (maxLocal == -1)
! 					maxLocal = maxJobs;
! 				Job_Init(maxJobs, maxLocal);
! 			}
  
  			/* Traverse the graph, checking on all the targets.  */
  			outOfDate = Make_Run(&targs);
--- 780,787 ----
  			 * read. This is done only if the -q flag wasn't given
  			 * (to prevent the .BEGIN from being executed should
  			 * it exist).  */
! 			if (!queryFlag)
! 				Job_Init(maxJobs);
  
  			/* Traverse the graph, checking on all the targets.  */
  			outOfDate = Make_Run(&targs);