Module Name: src
Committed By: uebayasi
Date: Fri Sep 4 06:10:47 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc files
src/usr.bin/config: defs.h mkmakefile.c
Log Message:
Make config(1) output only ${ALLFILES}, selected input files, and pass it to
Makefile.kern.inc, where files are filtered by suffix.
To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1149 -r1.1150 src/sys/conf/files
cvs rdiff -u -r1.91 -r1.92 src/usr.bin/config/defs.h
cvs rdiff -u -r1.66 -r1.67 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.236 src/sys/conf/Makefile.kern.inc:1.237
--- src/sys/conf/Makefile.kern.inc:1.236 Thu Sep 3 14:23:52 2015
+++ src/sys/conf/Makefile.kern.inc Fri Sep 4 06:10:47 2015
@@ -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 @@ COPTS.cpu.c+= -fno-stack-protector
# 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 @@ SYSTEM_LD_TAIL_STAGE2+= ${SYSTEM_LD_TAIL
## (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|}
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1149 src/sys/conf/files:1.1150
--- src/sys/conf/files:1.1149 Thu Sep 3 14:23:52 2015
+++ src/sys/conf/files Fri Sep 4 06:10:47 2015
@@ -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
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.91 src/usr.bin/config/defs.h:1.92
--- src/usr.bin/config/defs.h:1.91 Fri Sep 4 06:01:40 2015
+++ src/usr.bin/config/defs.h Fri Sep 4 06:10:47 2015
@@ -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 @@ 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 20150845
+#define CONFIG_VERSION 20150846
#define CONFIG_MINVERSION 0
/*
Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.66 src/usr.bin/config/mkmakefile.c:1.67
--- src/usr.bin/config/mkmakefile.c:1.66 Fri Sep 4 05:52:15 2015
+++ src/usr.bin/config/mkmakefile.c Fri Sep 4 06:10:47 2015
@@ -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 @@ emitofiles(FILE *fp)
{
emitallfiles(fp);
- fprintf(fp, "OFILES=\t${ALLFILES:M*.o}\n");
+ fprintf(fp, "#%%OFILES\n");
}
static void
@@ -454,7 +454,7 @@ emitcfiles(FILE *fp)
{
emitallfiles(fp);
- fprintf(fp, "CFILES=\t${ALLFILES:M*.c}\n");
+ fprintf(fp, "#%%CFILES\n");
}
static void
@@ -462,7 +462,7 @@ emitsfiles(FILE *fp)
{
emitallfiles(fp);
- fprintf(fp, "SFILES=\t${ALLFILES:M*.[sS]}\n");
+ fprintf(fp, "#%%SFILES\n");
}
static void
