From 84f3c4931bae49fe4455efac1639c138f3b9238e Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Thu, 11 Nov 2004 12:23:39 +0000
Subject: [PATCH] Get rid of now unused maxLocal variables.

---
 usr.bin/make/config.h |  9 ++-------
 usr.bin/make/main.c   | 13 ++-----------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 2a0c63ce4918..15a4b15cf72d 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -42,15 +42,10 @@
 
 /*
  * DEFMAXJOBS
- * DEFMAXLOCAL
- *	These control the default concurrency. On no occasion will more
+ *	This control the default concurrency. On no occasion will more
  *	than DEFMAXJOBS targets be created at once.
- *	DEFMAXLOCAL is the highest number of targets which will be
- *	created on the local machine at once. Note that if you set this
- *	to 0, nothing will ever happen...
  */
-#define	DEFMAXJOBS	4
-#define	DEFMAXLOCAL	1
+#define	DEFMAXJOBS	1
 
 /*
  * INCLUDES
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 4524fa3e978d..f065f3cf3049 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -91,10 +91,6 @@ __FBSDID("$FreeBSD$");
 
 #define WANT_ENV_MKLVL	1
 
-#ifndef	DEFMAXLOCAL
-#define	DEFMAXLOCAL DEFMAXJOBS
-#endif	/* DEFMAXLOCAL */
-
 #define	MAKEFLAGS	".MAKEFLAGS"
 
 Lst			create;		/* Targets to be made */
@@ -108,7 +104,6 @@ static Boolean		expandVars;	/* fully expand printed variables */
 static Lst		variables;	/* list of variables to print */
 int			maxJobs;	/* -j argument */
 static Boolean          forceJobs;      /* -j argument given */
-static int		maxLocal;	/* -L argument */
 Boolean			compatMake;	/* -B argument */
 Boolean			debug;		/* -d flag */
 Boolean			noExecute;	/* -n flag */
@@ -284,7 +279,6 @@ rearg:	while((c = getopt(argc, argv, OPTFLAGS)) != -1) {
 				    optarg);
 				usage();
 			}
-			maxLocal = maxJobs;
 			MFLAGS_append("-j", optarg);
 			break;
 		}
@@ -578,8 +572,7 @@ main(int argc, char **argv)
 	debug = 0;			/* No debug verbosity, please. */
 	jobsRunning = FALSE;
 
-	maxLocal = DEFMAXLOCAL;		/* Set default local max concurrency */
-	maxJobs = maxLocal;
+	maxJobs = DEFMAXJOBS;
 	forceJobs = FALSE;              /* No -j flag */
 	compatMake = FALSE;		/* No compat mode */
 
@@ -859,9 +852,7 @@ main(int argc, char **argv)
 			 * being executed should it exist).
 			 */
 			if (!queryFlag) {
-				if (maxLocal == -1)
-					maxLocal = maxJobs;
-				Job_Init(maxJobs, maxLocal);
+				Job_Init(maxJobs, maxJobs);
 				jobsRunning = TRUE;
 			}