Move some global variables to the correct files.

Submitted by:	Max Okumoto <okumoto@ucsd.edu> (7.232)

4 files changed, 12 insertions, 10 deletions

diff --git a/usr.bin/make/globals.h b/usr.bin/make/globals.h
index e8d66c0..e23de1e 100644
--- a/usr.bin/make/globals.h
+++ b/usr.bin/make/globals.h
@@ -93,10 +93,6 @@ extern Boolean	usePipes;
  * targets are out-of-date */
 extern Boolean	queryFlag;
 
-/* TRUE if environment should be searched for all variables before
- * the global context */
-extern Boolean	checkEnvFirst;
-
 /* List of specific variables for which the environment should be
  * searched before the global context */
 extern Lst envFirstVars;
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 77be9f4..5b45678 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -121,7 +121,6 @@ static Boolean	expandVars;	/* fully expand printed variables */
 /* list of variables to print */
 static Lst variables = Lst_Initializer(variables);
 
-int		maxJobs;	/* -j argument */
 static Boolean	forceJobs;      /* -j argument given */
 Boolean		compatMake;	/* -B argument */
 Boolean		debug;		/* -d flag */
@@ -133,8 +132,6 @@ Boolean		usePipes;	/* !-P flag */
 Boolean		ignoreErrors;	/* -i flag */
 Boolean		beSilent;	/* -s flag */
 Boolean		beVerbose;	/* -v flag */
-Boolean		oldVars;	/* variable substitution style */
-Boolean		checkEnvFirst;	/* -e flag */
 
 /* (-E) vars to override from env */
 Lst envFirstVars = Lst_Initializer(envFirstVars);
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index 55e5b79..eb83c52 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -180,9 +180,12 @@ static char	varNoError[] = "";
  * The four contexts are searched in the reverse order from which they are
  * listed.
  */
-GNode	*VAR_ENV;	/* variables from the environment */
-GNode	*VAR_GLOBAL;	/* variables from the makefile */
-GNode	*VAR_CMD;	/* variables defined on the command-line */
+static GNode	*VAR_ENV;	/* variables from the environment */
+GNode		*VAR_GLOBAL;	/* variables from the makefile */
+GNode		*VAR_CMD;	/* variables defined on the command-line */
+
+Boolean		oldVars;	/* variable substitution style */
+Boolean		checkEnvFirst;	/* -e flag */
 
 #define	OPEN_PAREN		'('
 #define	CLOSE_PAREN		')'
diff --git a/usr.bin/make/var.h b/usr.bin/make/var.h
index 42cdd93..51e8412 100644
--- a/usr.bin/make/var.h
+++ b/usr.bin/make/var.h
@@ -57,6 +57,12 @@ extern struct GNode	*VAR_CMD;
  */
 extern char		var_Error[];
 
+/*
+ * TRUE if environment should be searched for all variables before
+ * the global context
+ */
+extern Boolean		checkEnvFirst;
+
 /* Do old-style variable substitution */
 extern Boolean		oldVars;