diff options
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/job.c | 4 | ||||
| -rw-r--r-- | usr.bin/make/main.c | 25 | ||||
| -rw-r--r-- | usr.bin/make/make.1 | 49 | ||||
| -rw-r--r-- | usr.bin/make/make.h | 3 | ||||
| -rw-r--r-- | usr.bin/make/parse.c | 6 |
5 files changed, 17 insertions, 70 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index aa42d585369f..d7451fc14dae 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: job.c,v 1.10 1998/08/24 10:15:53 cracauer Exp $ + * $Id: job.c,v 1.9 1998/06/04 05:48:57 bde Exp $ */ #ifndef lint @@ -2423,7 +2423,7 @@ Job_Init(maxproc, maxlocal) lastNode = NILGNODE; - if (maxJobs == 1 || beVerbose == 0 + if (maxJobs == 1 #ifdef REMOTE || noMessages #endif diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index 02447e5c42c6..63dbe1acea14 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -47,7 +47,7 @@ static const char copyright[] = static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94"; #endif static const char rcsid[] = - "$Id: main.c,v 1.28 1998/11/14 16:15:04 dg Exp $"; + "$Id: main.c,v 1.25 1998/07/26 17:06:05 imp Exp $"; #endif /* not lint */ /*- @@ -133,7 +133,6 @@ Boolean touchFlag; /* -t flag */ 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 */ static Boolean jobsRunning; /* TRUE if the jobs might be running */ @@ -172,9 +171,9 @@ MainParseArgs(argc, argv) optind = 1; /* since we're called more than once */ #ifdef REMOTE -# define OPTFLAGS "BD:I:L:PSV:d:ef:ij:km:nqrstv" +# define OPTFLAGS "BD:I:L:PSV:d:ef:ij:km:nqrst" #else -# define OPTFLAGS "BD:I:PSV:d:ef:ij:km:nqrstv" +# define OPTFLAGS "BD:I:PSV:d:ef:ij:km:nqrst" #endif rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) { switch(c) { @@ -321,10 +320,6 @@ rearg: while((c = getopt(argc, argv, OPTFLAGS)) != -1) { touchFlag = TRUE; Var_Append(MAKEFLAGS, "-t", VAR_GLOBAL); break; - case 'v': - beVerbose = TRUE; - Var_Append(MAKEFLAGS, "-v", VAR_GLOBAL); - break; default: case '?': usage(); @@ -439,12 +434,8 @@ main(argc, argv) { Lst targs; /* target nodes to create -- passed to Make_Init */ Boolean outOfDate = TRUE; /* FALSE if all targets up to date */ - struct stat sa; - char *p, *p1, *path, *pathp; -#ifdef WANT_ENV_PWD - struct stat sb; - char *pwd; -#endif + struct stat sb, sa; + char *p, *p1, *path, *pathp, *pwd; char mdpath[MAXPATHLEN + 1]; char obpath[MAXPATHLEN + 1]; char cdpath[MAXPATHLEN + 1]; @@ -479,13 +470,11 @@ main(argc, argv) if (stat(curdir, &sa) == -1) err(2, "%s", curdir); -#ifdef WANT_ENV_PWD if ((pwd = getenv("PWD")) != NULL) { if (stat(pwd, &sb) == 0 && sa.st_ino == sb.st_ino && sa.st_dev == sb.st_dev) (void) strcpy(curdir, pwd); } -#endif #if defined(__i386__) /* @@ -569,9 +558,7 @@ main(argc, argv) objdir = curdir; } -#ifdef WANT_ENV_PWD setenv("PWD", objdir, 1); -#endif create = Lst_Init(FALSE); makefiles = Lst_Init(FALSE); @@ -1273,7 +1260,7 @@ static void usage() { (void)fprintf(stderr, "%s\n%s\n%s\n", -"usage: make [-Beiknqrstv] [-D variable] [-d flags] [-f makefile]", +"usage: make [-Beiknqrst] [-D variable] [-d flags] [-f makefile ]", " [-I directory] [-j max_jobs] [-m directory] [-V variable]", " [variable=value] [target ...]"); exit(2); diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1 index e4f86fba1dbb..89a1e3fec902 100644 --- a/usr.bin/make/make.1 +++ b/usr.bin/make/make.1 @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)make.1 8.4 (Berkeley) 3/19/94 -.\" $Id: make.1,v 1.15 1998/11/15 05:51:55 bde Exp $ +.\" $Id: make.1,v 1.11 1997/07/24 06:58:07 charnier Exp $ .\" .Dd March 19, 1994 .Dt MAKE 1 @@ -40,7 +40,7 @@ .Nd maintain program dependencies .Sh SYNOPSIS .Nm make -.Op Fl Beiknqrstv +.Op Fl Beiknqrst .Op Fl D Ar variable .Op Fl d Ar flags .Op Fl f Ar makefile @@ -57,17 +57,15 @@ is a program designed to simplify the maintenance of other programs. Its input is a list of specifications as to the files upon which programs and other files depend. -.Nm Make -searches a built-in path for this list. If the file .Ql Pa makefile -exists along this path, it is read for this list of specifications. +exists, it is read for this list of specifications. If it does not exist, the file .Ql Pa Makefile -is used. +is read. If the file .Ql Pa .depend -exists, it is also read (see +exists, it is read (see .Xr mkdep 1) . .Pp This manual page is intended as a reference document only. @@ -185,9 +183,6 @@ Do not build any targets. Multiple instances of this option may be specified; the variables will be printed one per line, with a blank line for each null or undefined variable. -.It Fl v -Be extra verbose. -For multi-job makes, this will cause file banners to be generated. .It Ar variable=value Set the value of the variable .Ar variable @@ -433,8 +428,7 @@ entered into the environment for all programs which .Nm make executes. .It Ev PWD -Alternate path to the current directory. Supported if built with WANT_ENV_PWD -defined. +Alternate path to the current directory. .Nm make normally sets .Ql Va .CURDIR @@ -940,33 +934,6 @@ command in the file. Each source specifies a suffix to .Nm make . If no sources are specified, any previous specified suffices are deleted. -.Sh SEARCH PATH -.Nm Make -searches for -.Ql Pa Makefile -in the following directories, in order: -.Pp -.Bl -enum -compact -.It -${MAKEOBJDIRPREFIX}`cwd` -.It -${MAKEOBJDIR} -.It -obj.${MACHINE} -.It -obj -.It -/usr/obj${MACHINE}`cwd` -.It -The current directory (`cwd`). -.El -.Pp -If -.Nm make -finds the -.Ql Pa Makefile -someplace other than the current working directory, it adds the CWD to -the search path. .Sh ENVIRONMENT .Nm Make utilizes the following environment variables, if they exist: @@ -985,16 +952,12 @@ list of dependencies list of dependencies .It makefile list of dependencies -.It obj -object directory .It sys.mk system makefile .It /usr/share/mk system makefile directory .It /usr/share/doc/psd/12.make PMake tutorial -.It /usr/obj -system object directory prefix .El .Sh SEE ALSO .Xr mkdep 1 diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h index 52d01db9f60d..91e2d3aed7e8 100644 --- a/usr.bin/make/make.h +++ b/usr.bin/make/make.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)make.h 8.3 (Berkeley) 6/13/95 - * $Id: make.h,v 1.7 1997/02/22 19:27:16 peter Exp $ + * $Id$ */ /*- @@ -294,7 +294,6 @@ extern Lst dirSearchPath; /* The list of directories to search when extern Boolean compatMake; /* True if we are make compatible */ extern Boolean ignoreErrors; /* True if should ignore all errors */ extern Boolean beSilent; /* True if should print no commands */ -extern Boolean beVerbose; /* True if should print extra cruft */ extern Boolean noExecute; /* True if should execute nothing */ extern Boolean allPrecious; /* True if every target is precious */ extern Boolean keepgoing; /* True if should continue on unaffected diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index fda738a8a6a9..388fa07d4963 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94"; #endif static const char rcsid[] = - "$Id: parse.c,v 1.19 1998/05/25 03:28:37 steve Exp $"; + "$Id: parse.c,v 1.18 1997/07/24 06:58:08 charnier Exp $"; #endif /* not lint */ /*- @@ -1412,10 +1412,8 @@ Parse_DoVar (line, ctxt) default: #ifdef SUNSHCMD while (*opc != ':') - if (opc == line) + if (--opc < line) break; - else - --opc; if (strncmp(opc, ":sh", 3) == 0) { type = VAR_SHELL; |