[src/trunk]: src Make config(1) output only ${ALLFILES}, selected input files...

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

details:   https://anonhg.NetBSD.org/src/rev/867928280e29
branches:  trunk
changeset: 810566:867928280e29
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Fri Sep 04 06:10:47 2015 +0000

description:
Make config(1) output only ${ALLFILES}, selected input files, and pass it to
Makefile.kern.inc, where files are filtered by suffix.

diffstat:

 sys/conf/Makefile.kern.inc  |   7 +++++--
 sys/conf/files              |   4 ++--
 usr.bin/config/defs.h       |   4 ++--
 usr.bin/config/mkmakefile.c |  10 +++++-----
 4 files changed, 14 insertions(+), 11 deletions(-)

diffs (104 lines):

diff -r cc8adce548ec -r 867928280e29 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Fri Sep 04 06:01:40 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Fri Sep 04 06:10:47 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.236 2015/09/03 14:23:52 uebayasi Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.237 2015/09/04 06:10:47 uebayasi Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -118,7 +118,7 @@
 # files that match the shell patterns given in ${DEBUGLIST}
 #
 .for i in ${DEBUGLIST}
-. for j in ${CFILES:T:M$i.c}
+. for j in ${ALLFILES:M*.c:T:M$i.c}
 COPTS.${j}+=-g
 . endfor
 .endfor
@@ -292,6 +292,9 @@
 ## (6) port independent targets and dependencies: assym.h, vers.o
 ##
 
+CFILES=        ${ALLFILES:M*.c}
+SFILES=        ${ALLFILES:M*.[sS]}
+OFILES=        ${ALLFILES:M*.o}
 .if !defined(___USE_SUFFIX_RULES___)
 OBJS.c=        ${CFILES:T:R:C|$|.o|}
 OBJS.s=        ${SFILES:T:R:C|$|.o|}
diff -r cc8adce548ec -r 867928280e29 sys/conf/files
--- a/sys/conf/files    Fri Sep 04 06:01:40 2015 +0000
+++ b/sys/conf/files    Fri Sep 04 06:10:47 2015 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: files,v 1.1149 2015/09/03 14:23:52 uebayasi Exp $
+#      $NetBSD: files,v 1.1150 2015/09/04 06:10:47 uebayasi Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
-version        20150845
+version        20150846
 
 #
 # device classes
diff -r cc8adce548ec -r 867928280e29 usr.bin/config/defs.h
--- a/usr.bin/config/defs.h     Fri Sep 04 06:01:40 2015 +0000
+++ b/usr.bin/config/defs.h     Fri Sep 04 06:10:47 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.91 2015/09/04 06:01:40 uebayasi Exp $       */
+/*     $NetBSD: defs.h,v 1.92 2015/09/04 06:10:47 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         20150845
+#define CONFIG_VERSION         20150846
 #define CONFIG_MINVERSION      0
 
 /*
diff -r cc8adce548ec -r 867928280e29 usr.bin/config/mkmakefile.c
--- a/usr.bin/config/mkmakefile.c       Fri Sep 04 06:01:40 2015 +0000
+++ b/usr.bin/config/mkmakefile.c       Fri Sep 04 06:10:47 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkmakefile.c,v 1.66 2015/09/04 05:52:15 uebayasi Exp $ */
+/*     $NetBSD: mkmakefile.c,v 1.67 2015/09/04 06:10:47 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkmakefile.c,v 1.66 2015/09/04 05:52:15 uebayasi Exp $");
+__RCSID("$NetBSD: mkmakefile.c,v 1.67 2015/09/04 06:10:47 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <ctype.h>
@@ -336,7 +336,7 @@
 {
 
        emitallfiles(fp);
-       fprintf(fp, "OFILES=\t${ALLFILES:M*.o}\n");
+       fprintf(fp, "#%%OFILES\n");
 }
 
 static void
@@ -454,7 +454,7 @@
 {
 
        emitallfiles(fp);
-       fprintf(fp, "CFILES=\t${ALLFILES:M*.c}\n");
+       fprintf(fp, "#%%CFILES\n");
 }
 
 static void
@@ -462,7 +462,7 @@
 {
 
        emitallfiles(fp);
-       fprintf(fp, "SFILES=\t${ALLFILES:M*.[sS]}\n");
+       fprintf(fp, "#%%SFILES\n");
 }
 
 static void