d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move some global variables to the correct files.

Browse Source 
Submitted by:	Max Okumoto <okumoto@ucsd.edu> (7.232)
This commit is contained in:
Hartmut Brandt 2005-05-12 11:58:39 +00:00
parent e30f38a08e
commit 0ec9b6feef
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=146134
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/make/globals.h
View File

@ -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;

3
usr.bin/make/main.c
View File

@ -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);

9
usr.bin/make/var.c
View File

@ -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 ')'

6
usr.bin/make/var.h
View File

@ -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;