- fix WITH_CTF when specified in /etc/src.conf [1]

- CTFCONVERT_CMD=... is a hack (should be defined to empty string instead):
make(1) should be taught to ignore empty commands silently in compat mode
(as it does in !compat mode, GNU make also silently ignores empty commands)
and to skip printing empty commands in !compat mode
- config(8) should generate ${NORMAL_CTFCONVERT} invocation without '@':
this will allow to simplify kern.pre.mk even more and lessen the number
of shell invocations during kernel build when CTF is turned off
- WITH_CTF can now be converted to usual MK_CTF=yes/no infrastructure

Pointy hat to:	fjoe [1]

1 files changed, 19 insertions, 63 deletions

diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index d5577b1..e8ec4c1 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -59,12 +59,6 @@ CFLAGS		+=	-fno-strict-aliasing
 .endif
 PO_CFLAGS	?=	${CFLAGS}
 
-# Turn CTF conversion off by default for now. This default could be
-# changed later if DTrace becomes popular.
-.if !defined(WITH_CTF)
-NO_CTF		=	1
-.endif
-
 # C Type Format data is required for DTrace
 CTFFLAGS	?=	-L VERSION
 
@@ -158,15 +152,11 @@ YFLAGS		?=	-d
 # SINGLE SUFFIX RULES
 .c:
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${.IMPSRC}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .f:
 	${FC} ${FFLAGS} ${LDFLAGS} -o ${.TARGET} ${.IMPSRC}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .sh:
 	cp -f ${.IMPSRC} ${.TARGET}
@@ -176,33 +166,25 @@ YFLAGS		?=	-d
 
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .f.o:
 	${FC} ${FFLAGS} -c ${.IMPSRC}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .y.o:
 	${YACC} ${YFLAGS} ${.IMPSRC}
 	${CC} ${CFLAGS} -c y.tab.c
 	rm -f y.tab.c
 	mv y.tab.o ${.TARGET}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .l.o:
 	${LEX} ${LFLAGS} ${.IMPSRC}
 	${CC} ${CFLAGS} -c lex.yy.c
 	rm -f lex.yy.c
 	mv lex.yy.o ${.TARGET}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .y.c:
 	${YACC} ${YFLAGS} ${.IMPSRC}
@@ -240,15 +222,11 @@ YFLAGS		?=	-d
 
 .c:
 	${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .c.o:
 	${CC} ${CFLAGS} -c ${.IMPSRC}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .cc .cpp .cxx .C:
 	${CXX} ${CXXFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET}
@@ -258,15 +236,11 @@ YFLAGS		?=	-d
 
 .m.o:
 	${OBJC} ${OBJCFLAGS} -c ${.IMPSRC}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .p.o:
 	${PC} ${PFLAGS} -c ${.IMPSRC}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .e .r .F .f:
 	${FC} ${RFLAGS} ${EFLAGS} ${FFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} \
@@ -277,38 +251,28 @@ YFLAGS		?=	-d
 
 .S.o:
 	${CC} ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .asm.o:
 	${CC} -x assembler-with-cpp ${CFLAGS} ${ACFLAGS} -c ${.IMPSRC}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .s.o:
 	${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 # XXX not -j safe
 .y.o:
 	${YACC} ${YFLAGS} ${.IMPSRC}
 	${CC} ${CFLAGS} -c y.tab.c -o ${.TARGET}
 	rm -f y.tab.c
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .l.o:
 	${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c
 	${CC} ${CFLAGS} -c ${.PREFIX}.tmp.c -o ${.TARGET}
 	rm -f ${.PREFIX}.tmp.c
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 # XXX not -j safe
 .y.c:
@@ -320,34 +284,26 @@ YFLAGS		?=	-d
 
 .s.out .c.out .o.out:
 	${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .f.out .F.out .r.out .e.out:
 	${FC} ${EFLAGS} ${RFLAGS} ${FFLAGS} ${LDFLAGS} ${.IMPSRC} \
 	    ${LDLIBS} -o ${.TARGET}
 	rm -f ${.PREFIX}.o
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 # XXX not -j safe
 .y.out:
 	${YACC} ${YFLAGS} ${.IMPSRC}
 	${CC} ${CFLAGS} ${LDFLAGS} y.tab.c ${LDLIBS} -ly -o ${.TARGET}
 	rm -f y.tab.c
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 .l.out:
 	${LEX} -t ${LFLAGS} ${.IMPSRC} > ${.PREFIX}.tmp.c
 	${CC} ${CFLAGS} ${LDFLAGS} ${.PREFIX}.tmp.c ${LDLIBS} -ll -o ${.TARGET}
 	rm -f ${.PREFIX}.tmp.c
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	${CTFCONVERT_CMD}
 
 # FreeBSD build pollution.  Hide it in the non-POSIX part of the ifdef.
 __MAKE_CONF?=/etc/make.conf