On Sun, 14 May 2000, Will Andrews wrote:
# Some time ago I was complaining about how there is no way to force make(1)
# to display the commands executed by @-prefixed commands in Makefiles.
[snip]
I too like this idea and along the lines of what Lyndon suggested
how about the attached patch instead? Aside from being somewhat
poorly named my hat's off to you for coming up with such a simple
solution to a (mis)feature that has bugged me for a long time. :)
-steve
Index: compat.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/make/compat.c,v
retrieving revision 1.17
diff -u -r1.17 compat.c
--- compat.c 2000/04/14 06:39:10 1.17
+++ compat.c 2000/05/14 19:40:52
@@ -240,7 +240,7 @@
while ((*cmd == '@') || (*cmd == '-')) {
if (*cmd == '@') {
- silent = TRUE;
+ silent = DEBUG(LOUD) ? FALSE : TRUE;
} else {
errCheck = FALSE;
}
Index: job.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/make/job.c,v
retrieving revision 1.17
diff -u -r1.17 job.c
--- job.c 2000/01/17 06:43:40 1.17
+++ job.c 2000/05/14 19:40:34
@@ -555,7 +555,7 @@
*/
while (*cmd == '@' || *cmd == '-') {
if (*cmd == '@') {
- shutUp = TRUE;
+ shutUp = DEBUG(LOUD) ? FALSE : TRUE;
} else {
errOff = TRUE;
}
Index: main.c
===================================================================
RCS file: /home/ncvs/src/usr.bin/make/main.c,v
retrieving revision 1.35
diff -u -r1.35 main.c
--- main.c 1999/11/23 10:35:24 1.35
+++ main.c 2000/05/14 19:37:40
@@ -262,6 +262,9 @@
case 'j':
debug |= DEBUG_JOB;
break;
+ case 'l':
+ debug |= DEBUG_LOUD;
+ break;
case 'm':
debug |= DEBUG_MAKE;
break;
Index: make.h
===================================================================
RCS file: /home/ncvs/src/usr.bin/make/make.h,v
retrieving revision 1.12
diff -u -r1.12 make.h
--- make.h 1999/09/11 13:17:35 1.12
+++ make.h 2000/05/14 19:41:05
@@ -359,7 +359,8 @@
#define DEBUG_SUFF 0x0080
#define DEBUG_TARG 0x0100
#define DEBUG_VAR 0x0200
-#define DEBUG_FOR 0x0400
+#define DEBUG_FOR 0x0400
+#define DEBUG_LOUD 0x0800
#ifdef __STDC__
#define CONCAT(a,b) a##b
