[src/trunk]: src Move `all' target definition to Makefile.kern.inc.

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

details:   https://anonhg.NetBSD.org/src/rev/ea4265b37193
branches:  trunk
changeset: 340406:ea4265b37193
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Sep 03 09:28:00 2015 +0000

description:
Move `all' target definition to Makefile.kern.inc.

diffstat:

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

diffs (98 lines):

diff -r 3f4764c1eaa1 -r ea4265b37193 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Thu Sep 03 08:16:36 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Thu Sep 03 09:28:00 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.233 2015/09/03 06:24:15 uebayasi Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.234 2015/09/03 09:28:00 uebayasi Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -213,7 +213,7 @@
 # xxx: ${SYSTEM_DEP} swapxxxx.o vers.o build_kernel
 
 SYSTEM_OBJ?=   ${MD_OBJS} ${MI_OBJS} ${OBJS} ${SYSLIBCOMPAT} ${LIBKERN}
-SYSTEM_DEP+=   Makefile ${SYSTEM_OBJ} .gdbinit
+SYSTEM_DEP+=   Makefile ${SYSTEM_OBJ}
 .if defined(CTFMERGE)
 SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
 .else
@@ -493,7 +493,10 @@
 CPPFLAGS+=     ${CPPFLAGS.${.IMPSRC:T}}
 CWARNFLAGS+=   ${CWARNFLAGS.${.IMPSRC:T}}
 
+.MAIN: all
+all: .gdbinit
 .for k in ${KERNELS}
+all: .WAIT ${k}
 ${k}: ${SYSTEM_DEP:O} swap${k}.o vers.o build_kernel
 .endfor
 
diff -r 3f4764c1eaa1 -r ea4265b37193 sys/conf/files
--- a/sys/conf/files    Thu Sep 03 08:16:36 2015 +0000
+++ b/sys/conf/files    Thu Sep 03 09:28:00 2015 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: files,v 1.1147 2015/09/03 06:09:46 uebayasi Exp $
+#      $NetBSD: files,v 1.1148 2015/09/03 09:28:00 uebayasi Exp $
 #      @(#)files.newconf       7.5 (Berkeley) 5/10/93
 
-version        20150843
+version        20150844
 
 #
 # device classes
diff -r 3f4764c1eaa1 -r ea4265b37193 usr.bin/config/defs.h
--- a/usr.bin/config/defs.h     Thu Sep 03 08:16:36 2015 +0000
+++ b/usr.bin/config/defs.h     Thu Sep 03 09:28:00 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: defs.h,v 1.87 2015/09/03 06:09:46 uebayasi Exp $       */
+/*     $NetBSD: defs.h,v 1.88 2015/09/03 09:28:00 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         20150843
+#define CONFIG_VERSION         20150844
 #define CONFIG_MINVERSION      0
 
 /*
diff -r 3f4764c1eaa1 -r ea4265b37193 usr.bin/config/mkmakefile.c
--- a/usr.bin/config/mkmakefile.c       Thu Sep 03 08:16:36 2015 +0000
+++ b/usr.bin/config/mkmakefile.c       Thu Sep 03 09:28:00 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mkmakefile.c,v 1.61 2015/09/03 06:09:46 uebayasi Exp $ */
+/*     $NetBSD: mkmakefile.c,v 1.62 2015/09/03 09:28:00 uebayasi Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -45,7 +45,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: mkmakefile.c,v 1.61 2015/09/03 06:09:46 uebayasi Exp $");
+__RCSID("$NetBSD: mkmakefile.c,v 1.62 2015/09/03 09:28:00 uebayasi Exp $");
 
 #include <sys/param.h>
 #include <ctype.h>
@@ -534,19 +534,6 @@
 {
        struct config *cf;
 
-       fputs(".MAIN: all\n", fp);
-       fputs("all:", fp);
-       TAILQ_FOREACH(cf, &allcf, cf_next) {
-               fprintf(fp, " %s", cf->cf_name);
-               /*
-                * If we generate multiple configs inside the same build directory
-                * with a parallel build, strange things may happen, so sequentialize
-                * them.
-                */
-               if (cf != TAILQ_LAST(&allcf,conftq))
-                       fprintf(fp, " .WAIT");
-       }
-       fputs("\n\n", fp);
        /*
         * Generate the backward-compatible "build_kernel" rule if
         * sys/conf/Makefile.kern.inc doesn't define any (pre-2014 Aug).