From 4d7662ab3427cac6e827d0ee7c8bfe34839f4d5d Mon Sep 17 00:00:00 2001
From: dg <dg@FreeBSD.org>
Date: Sat, 14 Nov 1998 16:15:04 +0000
Subject: Added a -v (verbose) option and hid multi-job file banner generation
 behind it.

---
 usr.bin/make/job.c  |  4 ++--
 usr.bin/make/main.c | 11 ++++++++---
 usr.bin/make/make.1 |  4 +++-
 usr.bin/make/make.h |  3 ++-
 4 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'usr.bin/make')

diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index d7451fc..aa42d58 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.9 1998/06/04 05:48:57 bde Exp $
+ *	$Id: job.c,v 1.10 1998/08/24 10:15:53 cracauer Exp $
  */
 
 #ifndef lint
@@ -2423,7 +2423,7 @@ Job_Init(maxproc, maxlocal)
 
     lastNode =	  NILGNODE;
 
-    if (maxJobs == 1
+    if (maxJobs == 1 || beVerbose == 0
 #ifdef REMOTE
 	|| noMessages
 #endif
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 2df59ec..16f9ea1 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.26 1998/09/09 14:58:30 kato Exp $";
+	"$Id: main.c,v 1.27 1998/10/18 00:51:46 obrien Exp $";
 #endif /* not lint */
 
 /*-
@@ -133,6 +133,7 @@ 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 */
@@ -171,9 +172,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:nqrst"
+# define OPTFLAGS "BD:I:L:PSV:d:ef:ij:km:nqrstv"
 #else
-# define OPTFLAGS "BD:I:PSV:d:ef:ij:km:nqrst"
+# define OPTFLAGS "BD:I:PSV:d:ef:ij:km:nqrstv"
 #endif
 rearg:	while((c = getopt(argc, argv, OPTFLAGS)) != -1) {
 		switch(c) {
@@ -320,6 +321,10 @@ 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();
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 9a15daa..7853b14 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.12 1998/05/25 03:28:37 steve Exp $
+.\"	$Id: make.1,v 1.13 1998/10/18 00:51:46 obrien Exp $
 .\"
 .Dd March 19, 1994
 .Dt MAKE 1
@@ -173,6 +173,8 @@ before each command line in the makefile.
 .It Fl t
 Rather than re-building a target as specified in the makefile, create it
 or update its modification time to make it appear up-to-date.
+.It Fl v
+Be extra verbose. For multi-job makes, this will cause file banners to be generated.
 .It Fl V Ar variable
 Print
 .Nm make Ns 's
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 91e2d3a..52d01db 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$
+ *	$Id: make.h,v 1.7 1997/02/22 19:27:16 peter Exp $
  */
 
 /*-
@@ -294,6 +294,7 @@ 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
-- 
cgit v1.1