Module Name: src
Committed By: sjg
Date: Tue Jul 30 19:09:57 UTC 2013
Modified Files:
src/usr.bin/make: job.c make.1
Log Message:
Allow an empty .MAKE.JOB.PREFIX to supress output of --- job --- tokens
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/usr.bin/make/job.c
cvs rdiff -u -r1.219 -r1.220 src/usr.bin/make/make.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.174 src/usr.bin/make/job.c:1.175
--- src/usr.bin/make/job.c:1.174 Fri Jul 5 22:14:56 2013
+++ src/usr.bin/make/job.c Tue Jul 30 19:09:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.174 2013/07/05 22:14:56 sjg Exp $ */
+/* $NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: job.c,v 1.174 2013/07/05 22:14:56 sjg Exp $";
+static char rcsid[] = "$NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
#if 0
static char sccsid[] = "@(#)job.c 8.2 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: job.c,v 1.174 2013/07/05 22:14:56 sjg Exp $");
+__RCSID("$NetBSD: job.c,v 1.175 2013/07/30 19:09:57 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -332,7 +332,7 @@ static Job childExitJob; /* child exit p
#define TARG_FMT "%s %s ---\n" /* Default format */
#define MESSAGE(fp, gn) \
- if (maxJobs != 1) \
+ if (maxJobs != 1 && targPrefix && *targPrefix) \
(void)fprintf(fp, TARG_FMT, targPrefix, gn->name)
static sigset_t caught_signals; /* Set of signals we handle */
Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.219 src/usr.bin/make/make.1:1.220
--- src/usr.bin/make/make.1:1.219 Tue Jul 16 14:00:53 2013
+++ src/usr.bin/make/make.1 Tue Jul 30 19:09:57 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: make.1,v 1.219 2013/07/16 14:00:53 christos Exp $
+.\" $NetBSD: make.1,v 1.220 2013/07/30 19:09:57 sjg Exp $
.\"
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" from: @(#)make.1 8.4 (Berkeley) 3/19/94
.\"
-.Dd July 15, 2013
+.Dd July 30, 2013
.Dt MAKE 1
.Os
.Sh NAME
@@ -745,6 +745,9 @@ then output for each target is prefixed
.Ql --- target ---
the first part of which can be controlled via
.Va .MAKE.JOB.PREFIX .
+If
+.Va .MAKE.JOB.PREFIX
+is empty, no token is printed.
.br
For example:
.Li .MAKE.JOB.PREFIX=${.newline}---${.MAKE:T}[${.MAKE.PID}]
