- 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]

4 files changed, 5 insertions, 18 deletions

diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index a69b2ec..9537e70 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -126,10 +126,3 @@ CFLAGS+=	-ffreestanding
     ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips"
 CFLAGS+=	-fstack-protector
 .endif
-
-#
-# Enable CTF conversion on request
-#
-.if defined(WITH_CTF)
-.undef NO_CTF
-.endif
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 6ae2a85..330ac49 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -94,7 +94,7 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
 	@rm -f ${.TARGET}
 	@echo linking ${.TARGET}
 	${SYSTEM_LD}
-.if !defined(NO_CTF)
+.if defined(WITH_CTF)
 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o
 .endif
 .if !defined(DEBUG)
@@ -249,9 +249,7 @@ kernel-reinstall:
 
 config.o env.o hints.o vers.o vnode_if.o:
 	${NORMAL_C}
-.if !defined(NO_CTF)
-	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.endif
+	@${NORMAL_CTFCONVERT}
 
 config.ln env.ln hints.ln vers.ln vnode_if.ln:
 	${NORMAL_LINT}
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 73aa326..e9ca8ed 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -123,8 +123,9 @@ NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
 NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
 	  ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
 
-.if !defined(NO_CTF)
-NORMAL_CTFCONVERT=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.if defined(WITH_CTF)
+CTFCONVERT_CMD=		${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+NORMAL_CTFCONVERT=	${ECHO} ${CTFCONVERT_CMD} && ${CTFCONVERT_CMD}
 .else
 NORMAL_CTFCONVERT=	:
 .endif
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 6e7b71e..422d74c 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -72,11 +72,6 @@ OBJCOPY?=	objcopy
 .error "Do not use KMODDEPS on 5.0+; use MODULE_VERSION/MODULE_DEPEND"
 .endif
 
-# Enable CTF conversion on request.
-.if defined(WITH_CTF)
-.undef NO_CTF
-.endif
-
 .include <bsd.init.mk>
 
 .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S