diff options
| author | sjg <sjg@NetBSD.org> | 2013-07-30 19:09:57 +0000 |
|---|---|---|
| committer | sjg <sjg@NetBSD.org> | 2013-07-30 19:09:57 +0000 |
| commit | 25b6d93042d7607d8d678cf8debdcdad92aebbfa (patch) | |
| tree | db9f8b9a3e5f2cc3a45176377e4f1db9cf3e375c | |
| parent | ff7e26cf483f6f1e081330de6ec5b94550bd770a (diff) | |
Allow an empty .MAKE.JOB.PREFIX to supress output of --- job --- tokens
| -rw-r--r-- | usr.bin/make/job.c | 8 | ||||
| -rw-r--r-- | usr.bin/make/make.1 | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c index 5806a0a5366..b55a5d69c78 100644 --- a/usr.bin/make/job.c +++ b/usr.bin/make/job.c @@ -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 pseudo-job */ #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 */ diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1 index 056764a5aca..4e3c1117005 100644 --- a/usr.bin/make/make.1 +++ b/usr.bin/make/make.1 @@ -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 with a token .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}] |
