We don't need GEN_M_CFILES. Fold it into GEN_CFILES definition and

adjust as necessary.

Suggested by: bde

2 files changed, 5 insertions, 8 deletions

diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index e8f63ec..0dc728d 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -130,17 +130,14 @@ kernel-depend:
 	if [ -f .depend ]; then mv .depend .olddep; fi
 	${MAKE} _kernel-depend
 
-# XXX this belongs elsewhere (inside GEN_CFILES if possible).
-GEN_M_CFILES=	${MFILES:T:S/.m$/.c/}
-
 # The argument list can be very long, so use make -V and xargs to
 # pass it to mkdep.
-_kernel-depend: assym.s vnode_if.h \
-	    ${BEFORE_DEPEND} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} \
-	    ${GEN_M_CFILES} ${SFILES} ${MFILES:T:S/.m$/.h/}
+_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
+	    ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
+	    ${MFILES:T:S/.m$/.h/}
 	if [ -f .olddep ]; then mv .olddep .depend; fi
 	rm -f .newdep
-	${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES -V GEN_M_CFILES | \
+	${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | \
 	    MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
 	${MAKE} -V SFILES | \
 	    MKDEP_CPP="${CC} -E" xargs mkdep -a -f .newdep ${ASM_CFLAGS}
diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 0dc3b01..dc5e208 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -117,7 +117,7 @@ NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
 
 NORMAL_LINT=	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
 
-GEN_CFILES= $S/$M/$M/genassym.c
+GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/}
 SYSTEM_CFILES= config.c env.c hints.c majors.c vnode_if.c
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
 SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS}