Module Name: src
Committed By: christos
Date: Fri Nov 27 20:33:55 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 src/sys/conf/Makefile.kern.inc
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.247 src/sys/conf/Makefile.kern.inc:1.248
--- src/sys/conf/Makefile.kern.inc:1.247 Mon Sep 14 22:22:43 2015
+++ src/sys/conf/Makefile.kern.inc Fri Nov 27 15:33:55 2015
@@ -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 @@ ${_s:T:R}.o: ${_s}
.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 @@ dependall: depend .WAIT all
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 @@ install-kernel-${MACHINE_NAME}:
.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
##
