summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2023-06-03 21:23:07 +0000
committerlukem <lukem@NetBSD.org>2023-06-03 21:23:07 +0000
commit3e527b79b3f6a57d205c1f72fa2e4115b471e2ab (patch)
tree1eb135527437edef6ae4eca3c49c52988ef721a5 /share
parentc2b50ac4278bfc51980f6360255e646520bda810 (diff)
bsd.dep.mk: move MKDEPINCLUDES to bsd.own.mk
Add default for MKDEPINCLUDES=no to to bsd.own.mk _MKVARS.no. Simplify bsd.dep.mk check.
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.dep.mk6
-rw-r--r--share/mk/bsd.own.mk3
2 files changed, 6 insertions, 3 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk
index dbdeb3fa39d..78a011e6fb0 100644
--- a/share/mk/bsd.dep.mk
+++ b/share/mk/bsd.dep.mk
@@ -1,4 +1,6 @@
-# $NetBSD: bsd.dep.mk,v 1.88 2021/12/14 16:22:07 christos Exp $
+# $NetBSD: bsd.dep.mk,v 1.89 2023/06/03 21:23:07 lukem Exp $
+
+.include <bsd.init.mk>
##### Basic targets
realdepend: beforedepend .depend afterdepend
@@ -39,7 +41,7 @@ ${__DPSRCS.d}: ${__DPSRCS.notd} ${DPSRCS}
MKDEPSUFFLAGS=-s ${MKDEP_SUFFIXES:Q}
-.if defined(MKDEPINCLUDES) && ${MKDEPINCLUDES} != "no"
+.if ${MKDEPINCLUDES} != "no"
.STALE:
@echo Rebuilding dependency file: ${.ALLSRC}
@rm -f ${.ALLSRC}
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index a5d74139e27..44d809e3fc4 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1338 2023/06/03 21:21:32 lukem Exp $
+# $NetBSD: bsd.own.mk,v 1.1339 2023/06/03 21:23:07 lukem Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1350,6 +1350,7 @@ _MKVARS.no= \
MKCTF \
MKDEBUG \
MKDEBUGLIB \
+ MKDEPINCLUDES \
MKDTB \
MKDTRACE \
MKFIRMWARE \