Module Name: src
Committed By: uebayasi
Date: Thu Sep 3 14:23:52 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc files
src/usr.bin/config: defs.h files.c
Log Message:
Add generated *.c files (devsw.c and ioconf.c) to ${CFILES} by config(1)
internally. ${MI_CFILES} in Makefile.kern.inc is no longer needed.
To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1148 -r1.1149 src/sys/conf/files
cvs rdiff -u -r1.89 -r1.90 src/usr.bin/config/defs.h
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/config/files.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.235 src/sys/conf/Makefile.kern.inc:1.236
--- src/sys/conf/Makefile.kern.inc:1.235 Thu Sep 3 12:31:16 2015
+++ src/sys/conf/Makefile.kern.inc Thu Sep 3 14:23:52 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.235 2015/09/03 12:31:16 uebayasi Exp $
+# $NetBSD: Makefile.kern.inc,v 1.236 2015/09/03 14:23:52 uebayasi Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -195,15 +195,11 @@ SYSLIBCOMPATLN?= ${COMPATLIBLN}
##
.if !defined(___USE_SUFFIX_RULES___)
-MI_CFILES= devsw.c ioconf.c
_MD_OBJS= ${MD_OBJS:T}
.else
_MD_OBJS= ${MD_OBJS}
.endif
-# the need for a MI_SFILES variable is dubitable at best
-MI_OBJS=${MI_CFILES:S/.c/.o/}
-
##
## (5) link settings
##
@@ -215,7 +211,7 @@ MI_OBJS=${MI_CFILES:S/.c/.o/}
# load lines for config "xxx" will be emitted as:
# xxx: ${SYSTEM_DEP} swapxxxx.o vers.o build_kernel
-SYSTEM_OBJ?= ${_MD_OBJS} ${MI_OBJS} ${OBJS} ${SYSLIBCOMPAT} ${LIBKERN}
+SYSTEM_OBJ?= ${_MD_OBJS} ${OBJS} ${SYSLIBCOMPAT} ${LIBKERN}
SYSTEM_DEP+= Makefile ${SYSTEM_OBJ}
.if defined(CTFMERGE)
SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
@@ -404,7 +400,7 @@ dependall: depend .WAIT all
MKDEP_AFLAGS?= ${AFLAGS}
MKDEP_CFLAGS?= ${CFLAGS}
SSRCS=${_MD_SFILES} ${_SFILES}
-CSRCS=${_MD_CFILES} ${MI_CFILES} ${_CFILES}
+CSRCS=${_MD_CFILES} ${_CFILES}
SRCS=${SSRCS} ${CSRCS}
.if !defined(___USE_SUFFIX_RULES___)
DEPS= ${SRCS:T:u:R:S/$/.d/g}
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1148 src/sys/conf/files:1.1149
--- src/sys/conf/files:1.1148 Thu Sep 3 09:28:00 2015
+++ src/sys/conf/files Thu Sep 3 14:23:52 2015
@@ -1,7 +1,7 @@
-# $NetBSD: files,v 1.1148 2015/09/03 09:28:00 uebayasi Exp $
+# $NetBSD: files,v 1.1149 2015/09/03 14:23:52 uebayasi Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
-version 20150844
+version 20150845
#
# device classes
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.89 src/usr.bin/config/defs.h:1.90
--- src/usr.bin/config/defs.h:1.89 Thu Sep 3 13:53:36 2015
+++ src/usr.bin/config/defs.h Thu Sep 3 14:23:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.89 2015/09/03 13:53:36 uebayasi Exp $ */
+/* $NetBSD: defs.h,v 1.90 2015/09/03 14:23:52 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 20150844
+#define CONFIG_VERSION 20150845
#define CONFIG_MINVERSION 0
/*
Index: src/usr.bin/config/files.c
diff -u src/usr.bin/config/files.c:1.28 src/usr.bin/config/files.c:1.29
--- src/usr.bin/config/files.c:1.28 Thu Sep 3 13:53:36 2015
+++ src/usr.bin/config/files.c Thu Sep 3 14:23:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: files.c,v 1.28 2015/09/03 13:53:36 uebayasi Exp $ */
+/* $NetBSD: files.c,v 1.29 2015/09/03 14:23:52 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: files.c,v 1.28 2015/09/03 13:53:36 uebayasi Exp $");
+__RCSID("$NetBSD: files.c,v 1.29 2015/09/03 14:23:52 uebayasi Exp $");
#include <sys/param.h>
#include <errno.h>
@@ -274,12 +274,13 @@ fixfiles(void)
struct nvlist *flathead, **flatp;
int err, sel;
+ addfile("devsw.c", NULL, 0, NULL);
+ addfile("ioconf.c", NULL, 0, NULL);
+
if (Sflag) {
struct config *cf;
char swapname[100];
- addfile("devsw.c", NULL, 0, NULL);
- addfile("ioconf.c", NULL, 0, NULL);
TAILQ_FOREACH(cf, &allcf, cf_next) {
(void)snprintf(swapname, sizeof(swapname), "swap%s.c",
cf->cf_name);
