Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/conf Fix dependency of *.d -> assym.h in `-S' mode.



details:   https://anonhg.NetBSD.org/src/rev/8bb0113022f4
branches:  trunk
changeset: 340520:8bb0113022f4
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Sep 10 13:11:39 2015 +0000

description:
Fix dependency of *.d -> assym.h in `-S' mode.

diffstat:

 sys/conf/Makefile.kern.inc |  4 ++--
 sys/conf/assym.mk          |  8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 58ac39e77dfd -r 8bb0113022f4 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Thu Sep 10 12:30:08 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Thu Sep 10 13:11:39 2015 +0000
@@ -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 @@
 .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}
diff -r 58ac39e77dfd -r 8bb0113022f4 sys/conf/assym.mk
--- a/sys/conf/assym.mk Thu Sep 10 12:30:08 2015 +0000
+++ b/sys/conf/assym.mk Thu Sep 10 13:11:39 2015 +0000
@@ -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 @@
            ${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}



Home | Main Index | Thread Index | Old Index