FAST_DEPEND: Don't enable when .MAKE.MODE=meta.

This is because the .meta files generated from filemon already contain a
list of all files read to generate the object.

X-MFC-With:	r290433
MFC after:	3 weeks
Sponsored by:	EMC / Isilon Storage Division

diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index eea818b497566af406ea83fe259a2056c0b32309..4eb4880da3bed4f4d0946e035d6516f2f698ac6a 100644 (file)
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -55,7 +55,7 @@ MKDEPCMD?=    mkdep
 .endif
 DEPENDFILE?=   .depend
 DEPENDFILES=   ${DEPENDFILE}
-.if ${MK_FAST_DEPEND} == "yes"
+.if ${MK_FAST_DEPEND} == "yes" && ${.MAKE.MODE:Unormal:Mmeta*} == ""
 DEPENDFILES+=  ${DEPENDFILE}.*
 DEPEND_CFLAGS+=        -MD -MP -MF${DEPENDFILE}.${.TARGET}
 DEPEND_CFLAGS+=        -MT${.TARGET}

diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 9252b92857ed948448eecac5d543dd798adec5ae..851faaeaf6c0d30798e581ede94db3cd5ed210c8 100644 (file)
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -199,7 +199,7 @@ SRCS=       assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
        ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
        ${MFILES:T:S/.m$/.h/}
 DEPENDFILES=   .depend
-.if ${MK_FAST_DEPEND} == "yes"
+.if ${MK_FAST_DEPEND} == "yes" && ${.MAKE.MODE:Unormal:Mmeta*} == ""
 DEPENDFILES+=  .depend.*
 DEPEND_CFLAGS+=        -MD -MP -MF.depend.${.TARGET}
 DEPEND_CFLAGS+=        -MT${.TARGET}