Module Name: src
Committed By: uebayasi
Date: Thu Sep 10 13:11:39 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc assym.mk
Log Message:
Fix dependency of *.d -> assym.h in `-S' mode.
To generate a diff of this commit:
cvs rdiff -u -r1.244 -r1.245 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.4 -r1.5 src/sys/conf/assym.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.244 src/sys/conf/Makefile.kern.inc:1.245
--- src/sys/conf/Makefile.kern.inc:1.244 Mon Sep 7 15:55:06 2015
+++ src/sys/conf/Makefile.kern.inc Thu Sep 10 13:11:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.244 2015/09/07 15:55:06 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.245 2015/09/10 13:11:39 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -358,7 +358,7 @@ DEPS= ${SRCS:R:S/$/.d/g}
.if !defined(___USE_SUFFIX_RULES___)
.for _s in ${SSRCS}
.if !target(${_s:T:R}.d)
-${_s:T:R}.d: ${_s} assym.h
+${_s:T:R}.d: ${_s}
${_MKTARGET_CREATE}
${MKDEP} -f ${.TARGET}.tmp -- ${MKDEP_AFLAGS} \
${CPPFLAGS} ${CPPFLAGS.${_s:T}} ${_s}
Index: src/sys/conf/assym.mk
diff -u src/sys/conf/assym.mk:1.4 src/sys/conf/assym.mk:1.5
--- src/sys/conf/assym.mk:1.4 Thu Sep 10 09:30:01 2015
+++ src/sys/conf/assym.mk Thu Sep 10 13:11:39 2015
@@ -1,4 +1,4 @@
-# $NetBSD: assym.mk,v 1.4 2015/09/10 09:30:01 uebayasi Exp $
+# $NetBSD: assym.mk,v 1.5 2015/09/10 13:11:39 uebayasi Exp $
assym.h: ${GENASSYM_CONF} ${GENASSYM_EXTRAS} $S/conf/genassym.cf
${_MKTARGET_CREATE}
@@ -7,7 +7,13 @@ assym.h: ${GENASSYM_CONF} ${GENASSYM_EXT
${GENASSYM_CPPFLAGS} > assym.h.tmp && \
mv -f assym.h.tmp assym.h
+.if !defined(___USE_SUFFIX_RULES___)
+${SRCS:T:M*.[sS]:C|\.[Ss]|.o|}: assym.h
+${SRCS:T:M*.[sS]:C|\.[Ss]|.d|}: assym.h
+.else
${SRCS:M*.[sS]:C|\.[Ss]|.o|}: assym.h
+${SRCS:M*.[sS]:C|\.[Ss]|.d|}: assym.h
+.endif
assym.d: assym.h
${_MKTARGET_CREATE}
