Module Name: src
Committed By: uebayasi
Date: Thu Sep 3 06:09:46 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc files
src/usr.bin/config: defs.h mkmakefile.c
Log Message:
Define kernel dependency in Makefile.kern.inc.
To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1146 -r1.1147 src/sys/conf/files
cvs rdiff -u -r1.86 -r1.87 src/usr.bin/config/defs.h
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/config/mkmakefile.c
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.230 src/sys/conf/Makefile.kern.inc:1.231
--- src/sys/conf/Makefile.kern.inc:1.230 Thu Sep 3 04:17:55 2015
+++ src/sys/conf/Makefile.kern.inc Thu Sep 3 06:09:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.230 2015/09/03 04:17:55 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.231 2015/09/03 06:09:46 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -493,6 +493,10 @@ CFLAGS+= ${COPTS.${.IMPSRC:T}} ${CPUFLAG
CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
CWARNFLAGS+= ${CWARNFLAGS.${.IMPSRC:T}}
+.for k in ${KERNELS}
+${k}: ${SYSTEM_DEP} vers.o build_kernel
+.endfor
+
.if !defined(COPY_SYMTAB)
build_kernel: .USE
${SYSTEM_LD_HEAD}
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1146 src/sys/conf/files:1.1147
--- src/sys/conf/files:1.1146 Wed Sep 2 14:17:03 2015
+++ src/sys/conf/files Thu Sep 3 06:09:46 2015
@@ -1,7 +1,7 @@
-# $NetBSD: files,v 1.1146 2015/09/02 14:17:03 uebayasi Exp $
+# $NetBSD: files,v 1.1147 2015/09/03 06:09:46 uebayasi Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
-version 20150842
+version 20150843
#
# device classes
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.86 src/usr.bin/config/defs.h:1.87
--- src/usr.bin/config/defs.h:1.86 Wed Sep 2 14:17:03 2015
+++ src/usr.bin/config/defs.h Thu Sep 3 06:09:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.86 2015/09/02 14:17:03 uebayasi Exp $ */
+/* $NetBSD: defs.h,v 1.87 2015/09/03 06:09:46 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -107,7 +107,7 @@ extern const char *progname;
* The next two lines define the current version of the config(1) binary,
* and the minimum version of the configuration files it supports.
*/
-#define CONFIG_VERSION 20150842
+#define CONFIG_VERSION 20150843
#define CONFIG_MINVERSION 0
/*
Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.60 src/usr.bin/config/mkmakefile.c:1.61
--- src/usr.bin/config/mkmakefile.c:1.60 Wed Sep 2 16:29:44 2015
+++ src/usr.bin/config/mkmakefile.c Thu Sep 3 06:09:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: mkmakefile.c,v 1.60 2015/09/02 16:29:44 uebayasi Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.61 2015/09/03 06:09:46 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: mkmakefile.c,v 1.60 2015/09/02 16:29:44 uebayasi Exp $");
+__RCSID("$NetBSD: mkmakefile.c,v 1.61 2015/09/03 06:09:46 uebayasi Exp $");
#include <sys/param.h>
#include <ctype.h>
@@ -572,8 +572,6 @@ emitload(FILE *fp)
cf->cf_name);
}
fprintf(fp, "KERNELS+=%s\n", cf->cf_name);
- fprintf(fp, "%s: ${SYSTEM_DEP}%s vers.o build_kernel\n",
- cf->cf_name, swapobj);
}
fputs("\n", fp);
}
