Module Name: src
Committed By: erh
Date: Mon Dec 1 01:34:30 UTC 2014
Modified Files:
src/share/mk: bsd.dep.mk bsd.hostlib.mk bsd.hostprog.mk bsd.lib.mk
bsd.prog.mk
Log Message:
PR toolchain/9618: add ".d" to MKDEP_SUFFIXES so the depend files are rebuilt
if any of their dependencies (i.e. the files they refer to) are changed.
This allows changes to transitive included headers to be handled properly.
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.18 -r1.19 src/share/mk/bsd.hostlib.mk
cvs rdiff -u -r1.73 -r1.74 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.355 -r1.356 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.290 -r1.291 src/share/mk/bsd.prog.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.81 src/share/mk/bsd.dep.mk:1.82
--- src/share/mk/bsd.dep.mk:1.81 Sat Jul 19 17:19:22 2014
+++ src/share/mk/bsd.dep.mk Mon Dec 1 01:34:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.dep.mk,v 1.81 2014/07/19 17:19:22 plunky Exp $
+# $NetBSD: bsd.dep.mk,v 1.82 2014/12/01 01:34:30 erh Exp $
##### Basic targets
realdepend: beforedepend .depend afterdepend
@@ -9,7 +9,7 @@ beforedepend .depend afterdepend: # ensu
##### Default values
MKDEP?= mkdep
MKDEPCXX?= mkdep
-MKDEP_SUFFIXES?= .o
+MKDEP_SUFFIXES?= .o .d
##### Build rules
# some of the rules involve .h sources, so remove them from mkdep line
Index: src/share/mk/bsd.hostlib.mk
diff -u src/share/mk/bsd.hostlib.mk:1.18 src/share/mk/bsd.hostlib.mk:1.19
--- src/share/mk/bsd.hostlib.mk:1.18 Thu Apr 10 19:02:18 2014
+++ src/share/mk/bsd.hostlib.mk Mon Dec 1 01:34:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostlib.mk,v 1.18 2014/04/10 19:02:18 plunky Exp $
+# $NetBSD: bsd.hostlib.mk,v 1.19 2014/12/01 01:34:30 erh Exp $
.include <bsd.init.mk>
.include <bsd.sys.mk>
@@ -7,7 +7,7 @@
##### Default values
CFLAGS+= ${COPTS}
-MKDEP_SUFFIXES?= .o .lo
+MKDEP_SUFFIXES?= .o .lo .d
# Override these:
MKDEP:= ${HOST_MKDEP}
Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.73 src/share/mk/bsd.hostprog.mk:1.74
--- src/share/mk/bsd.hostprog.mk:1.73 Thu Apr 10 19:02:18 2014
+++ src/share/mk/bsd.hostprog.mk Mon Dec 1 01:34:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.hostprog.mk,v 1.73 2014/04/10 19:02:18 plunky Exp $
+# $NetBSD: bsd.hostprog.mk,v 1.74 2014/12/01 01:34:30 erh Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.include <bsd.init.mk>
@@ -81,7 +81,7 @@ LIBRUMPFS_TMPFS?= /usr/lib/librumpfs_tmp
LIBRUMPFS_UDF?= /usr/lib/librumpfs_udf.a
LIBRUMPFS_UFS?= /usr/lib/librumpfs_ufs.a
-MKDEP_SUFFIXES?= .lo .ln
+MKDEP_SUFFIXES?= .lo .ln .d
# Override these:
INSTALL:= ${INSTALL:NSTRIP=*}
Index: src/share/mk/bsd.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.355 src/share/mk/bsd.lib.mk:1.356
--- src/share/mk/bsd.lib.mk:1.355 Fri Jun 13 01:17:45 2014
+++ src/share/mk/bsd.lib.mk Mon Dec 1 01:34:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.355 2014/06/13 01:17:45 mrg Exp $
+# $NetBSD: bsd.lib.mk,v 1.356 2014/12/01 01:34:30 erh Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include <bsd.init.mk>
@@ -64,7 +64,7 @@ DPADD+= ${LIBDO.${_lib}}/lib${_lib}.so
.endif # }
##### Build and install rules
-MKDEP_SUFFIXES?= .o .po .pico .go .ln
+MKDEP_SUFFIXES?= .o .po .pico .go .ln .d
.if !defined(SHLIB_MAJOR) && exists(${SHLIB_VERSION_FILE}) # {
SHLIB_MAJOR != . ${SHLIB_VERSION_FILE} ; echo $$major
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.290 src/share/mk/bsd.prog.mk:1.291
--- src/share/mk/bsd.prog.mk:1.290 Tue Mar 25 09:52:55 2014
+++ src/share/mk/bsd.prog.mk Mon Dec 1 01:34:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.290 2014/03/25 09:52:55 ozaki-r Exp $
+# $NetBSD: bsd.prog.mk,v 1.291 2014/12/01 01:34:30 erh Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -59,7 +59,7 @@ CFLAGS+= ${COPTS}
CFLAGS+= -g
.endif
OBJCFLAGS+= ${OBJCOPTS}
-MKDEP_SUFFIXES?= .o .ln
+MKDEP_SUFFIXES?= .o .ln .d
# CTF preserve debug symbols
.if (${MKCTF:Uno} != "no") && (${CFLAGS:M-g} != "")
