Module Name: src
Committed By: uebayasi
Date: Thu Sep 3 09:28:00 UTC 2015
Modified Files:
src/sys/conf: Makefile.kern.inc files
src/usr.bin/config: defs.h mkmakefile.c
Log Message:
Move `all' target definition to Makefile.kern.inc.
To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.1147 -r1.1148 src/sys/conf/files
cvs rdiff -u -r1.87 -r1.88 src/usr.bin/config/defs.h
cvs rdiff -u -r1.61 -r1.62 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.233 src/sys/conf/Makefile.kern.inc:1.234
--- src/sys/conf/Makefile.kern.inc:1.233 Thu Sep 3 06:24:15 2015
+++ src/sys/conf/Makefile.kern.inc Thu Sep 3 09:28:00 2015
@@ -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 @@ MI_OBJS=${MI_CFILES:S/.c/.o/}
# 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 @@ CFLAGS+= ${COPTS.${.IMPSRC:T}} ${CPUFLAG
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
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1147 src/sys/conf/files:1.1148
--- src/sys/conf/files:1.1147 Thu Sep 3 06:09:46 2015
+++ src/sys/conf/files Thu Sep 3 09:28:00 2015
@@ -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
Index: src/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.87 src/usr.bin/config/defs.h:1.88
--- src/usr.bin/config/defs.h:1.87 Thu Sep 3 06:09:46 2015
+++ src/usr.bin/config/defs.h Thu Sep 3 09:28:00 2015
@@ -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 @@ 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 20150843
+#define CONFIG_VERSION 20150844
#define CONFIG_MINVERSION 0
/*
Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.61 src/usr.bin/config/mkmakefile.c:1.62
--- src/usr.bin/config/mkmakefile.c:1.61 Thu Sep 3 06:09:46 2015
+++ src/usr.bin/config/mkmakefile.c Thu Sep 3 09:28:00 2015
@@ -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 @@ emitload(FILE *fp)
{
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).
