[src/trunk]: src Add generated *.c files (devsw.c and ioconf.c) to ${CFILES} ...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9b3c65b424c4
branches:  trunk
changeset: 810555:9b3c65b424c4
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Sep 03 14:23:52 2015 +0000

description:
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.

diffstat:

 sys/conf/Makefile.kern.inc |  10 +++-------
 sys/conf/files             |   4 ++--
 usr.bin/config/defs.h      |   4 ++--
 usr.bin/config/files.c     |   9 +++++----
 4 files changed, 12 insertions(+), 15 deletions(-)

diffs (108 lines):

diff -r b437504ef550 -r 9b3c65b424c4 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Thu Sep 03 13:53:36 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Thu Sep 03 14:23:52 2015 +0000
@@ -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 @@
 ##
 
 .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 @@
 # 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 @@
 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}
diff -r b437504ef550 -r 9b3c65b424c4 sys/conf/files
--- a/sys/conf/files    Thu Sep 03 13:53:36 2015 +0000
+++ b/sys/conf/files    Thu Sep 03 14:23:52 2015 +0000
@@ -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
diff -r b437504ef550 -r 9b3c65b424c4 usr.bin/config/defs.h
--- a/usr.bin/config/defs.h     Thu Sep 03 13:53:36 2015 +0000
+++ b/usr.bin/config/defs.h     Thu Sep 03 14:23:52 2015 +0000
@@ -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 @@
  * 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
 
 /*
diff -r b437504ef550 -r 9b3c65b424c4 usr.bin/config/files.c
--- a/usr.bin/config/files.c    Thu Sep 03 13:53:36 2015 +0000
+++ b/usr.bin/config/files.c    Thu Sep 03 14:23:52 2015 +0000
@@ -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 @@
        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);