Module Name: src
Committed By: lukem
Date: Sat Jun 3 21:23:07 UTC 2023
Modified Files:
src/share/mk: bsd.dep.mk bsd.own.mk
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.1338 -r1.1339 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.88 src/share/mk/bsd.dep.mk:1.89
--- src/share/mk/bsd.dep.mk:1.88 Tue Dec 14 16:22:07 2021
+++ src/share/mk/bsd.dep.mk Sat Jun 3 21:23:07 2023
@@ -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}
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1338 src/share/mk/bsd.own.mk:1.1339
--- src/share/mk/bsd.own.mk:1.1338 Sat Jun 3 21:21:32 2023
+++ src/share/mk/bsd.own.mk Sat Jun 3 21:23:07 2023
@@ -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 \
