Module Name: src
Committed By: apb
Date: Sun Nov 4 11:12:32 UTC 2012
Modified Files:
src/sys/arch/next68k/stand/boot: Makefile
src/sys/conf: Makefile.kern.inc
src/sys/rump/librump/rumpkern: Makefile.rumpkern
src/usr.sbin/crash: Makefile
Log Message:
Add references to ${_NETBSD_VERSION_DEPENDS} for files that
need to be re-created when the NetBSD version changes. They
will also be re-created when any build settings are changed.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/next68k/stand/boot/Makefile
cvs rdiff -u -r1.158 -r1.159 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.119 -r1.120 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/crash/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/next68k/stand/boot/Makefile
diff -u src/sys/arch/next68k/stand/boot/Makefile:1.24 src/sys/arch/next68k/stand/boot/Makefile:1.25
--- src/sys/arch/next68k/stand/boot/Makefile:1.24 Sat Jan 22 19:19:21 2011
+++ src/sys/arch/next68k/stand/boot/Makefile Sun Nov 4 11:12:31 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2011/01/22 19:19:21 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2012/11/04 11:12:31 apb Exp $
NOMAN= # defined
@@ -77,10 +77,10 @@ srt0.o: ${.CURDIR}/srt0.s
${CC} -m68040 -x assembler-with-cpp ${INCLUDES} ${DEFS} -c ${.CURDIR}/srt0.s
.PHONY: build.c
-build.c:
+build.c: ${_NETBSD_VERSION_DEPENDS}
${HOST_SH} ${.CURDIR}/newvers.sh
-vers.c: version
+vers.c: version ${_NETBSD_VERSION_DEPENDS}
${HOST_SH} ${S}/conf/newvers_stand.sh ${.CURDIR}/version "next68k"
#installboot: ${.CURDIR}/installboot.sh
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.158 src/sys/conf/Makefile.kern.inc:1.159
--- src/sys/conf/Makefile.kern.inc:1.158 Fri Aug 10 16:05:26 2012
+++ src/sys/conf/Makefile.kern.inc Sun Nov 4 11:12:31 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.158 2012/08/10 16:05:26 joerg Exp $
+# $NetBSD: Makefile.kern.inc,v 1.159 2012/11/04 11:12:31 apb Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -338,7 +338,8 @@ _NVFLAGS=${NVFLAGS}
.if !target(vers.o)
newvers: vers.o
-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} $S/conf/newvers.sh $S/conf/osrelease.sh
+vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} $S/conf/newvers.sh \
+ $S/conf/osrelease.sh ${_NETBSD_VERSION_DEPENDS}
${_MKMSG_CREATE} vers.c
${HOST_SH} $S/conf/newvers.sh ${_NVFLAGS}
${_MKTARGET_COMPILE}
Index: src/sys/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.119 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.120
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.119 Fri Jul 20 09:20:05 2012
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sun Nov 4 11:12:31 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.119 2012/07/20 09:20:05 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.120 2012/11/04 11:12:31 apb Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -36,7 +36,8 @@ _NVFLAGS=-r
_NVFLAGS=
.endif
-vers.c: ${RUMPTOP}/../conf/newvers.sh ${RUMPTOP}/../conf/osrelease.sh ${RUMPTOP}/../sys/param.h
+vers.c: ${RUMPTOP}/../conf/newvers.sh ${RUMPTOP}/../conf/osrelease.sh \
+ ${RUMPTOP}/../sys/param.h ${_NETBSD_VERSION_DEPENDS}
${_MKMSG_CREATE} vers.c
${HOST_SH} ${RUMPTOP}/../conf/newvers.sh -i RUMP-ROAST -n ${_NVFLAGS}
SRCS+= vers.c
Index: src/usr.sbin/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.22 src/usr.sbin/crash/Makefile:1.23
--- src/usr.sbin/crash/Makefile:1.22 Fri Aug 31 11:52:39 2012
+++ src/usr.sbin/crash/Makefile Sun Nov 4 11:12:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/08/31 11:52:39 skrll Exp $
+# $NetBSD: Makefile,v 1.23 2012/11/04 11:12:32 apb Exp $
PROG= crash
MAN= crash.8
@@ -79,7 +79,7 @@ COPTS.db_output.c += -Wno-format-nonlite
# vers.c
SRCS+= vers.c
-vers.c: ${S}/conf/newvers.sh
+vers.c: ${S}/conf/newvers.sh ${_NETBSD_VERSION_DEPENDS}
${HOST_SH} ${S}/conf/newvers.sh -r -n
CLEANFILES+= vers.c version
