Source-Changes-HG archive

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

[src/trunk]: src/sys/conf PR/50483: David A. Holland: fix building of assym.d:



details:   https://anonhg.NetBSD.org/src/rev/bc7fede3733f
branches:  trunk
changeset: 341889:bc7fede3733f
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Nov 27 20:33:55 2015 +0000

description:
PR/50483: David A. Holland: fix building of assym.d:

        1. use += to add to DEPS
        2. move inclusion of rules mk. files before the rules are defined
           so that variables are set.

Now we get on amd64:

        mkdep: ignoring acpi_wakeup_low.d: No such file or directory
        mkdep: ignoring amd64func.d: No such file or directory
        mkdep: ignoring busfunc.d: No such file or directory
        mkdep: ignoring copy.d: No such file or directory
        mkdep: ignoring cpu_in_cksum.d: No such file or directory
        mkdep: ignoring cpufunc.d: No such file or directory

because there are no rules to generate those, but it is harmless.

diffstat:

 sys/conf/Makefile.kern.inc |  26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diffs (55 lines):

diff -r bc215e8b0a84 -r bc7fede3733f sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Fri Nov 27 16:52:32 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Fri Nov 27 20:33:55 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.247 2015/09/15 02:22:43 uebayasi Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.248 2015/11/27 20:33:55 christos Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -305,6 +305,16 @@
 .endfor
 .endif # !___USE_SUFFIX_RULES___
 
+.include "${S}/conf/ldscript.mk"
+.include "${S}/conf/assym.mk"
+.include "${S}/conf/newvers.mk"
+.include "${S}/dev/splash/splash.mk"
+.include "${S}/conf/mdroot.mk"
+.include "${S}/conf/lint.mk"
+.include "${S}/conf/cscope.mk"
+.include "${S}/conf/gdbinit.mk"
+.include "${S}/conf/ssp.mk"
+
 ##
 ## (7) misc targets: install, clean(dir), depend(all), lint, links, tags,
 ##                   cscope, mkid
@@ -350,9 +360,9 @@
 MKDEP_AFLAGS?= ${AFLAGS}
 MKDEP_CFLAGS?= ${CFLAGS}
 .if !defined(___USE_SUFFIX_RULES___)
-DEPS=  ${SRCS:T:R:S/$/.d/g}
+DEPS+= ${SRCS:T:R:S/$/.d/g}
 .else
-DEPS=  ${SRCS:R:S/$/.d/g}
+DEPS+= ${SRCS:R:S/$/.d/g}
 .endif
 
 .if !defined(___USE_SUFFIX_RULES___)
@@ -407,16 +417,6 @@
 .endif
 .endif
 
-.include "${S}/conf/ldscript.mk"
-.include "${S}/conf/assym.mk"
-.include "${S}/conf/newvers.mk"
-.include "${S}/dev/splash/splash.mk"
-.include "${S}/conf/mdroot.mk"
-.include "${S}/conf/lint.mk"
-.include "${S}/conf/cscope.mk"
-.include "${S}/conf/gdbinit.mk"
-.include "${S}/conf/ssp.mk"
-
 ##
 ## the kernel
 ##



Home | Main Index | Thread Index | Old Index