Module Name: src
Committed By: uebayasi
Date: Thu Oct 9 19:20:56 UTC 2014
Modified Files:
src/usr.bin/config: defs.h main.c mkmakefile.c
Log Message:
Steal -M to enable "modular" build.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/config/defs.h
cvs rdiff -u -r1.57 -r1.58 src/usr.bin/config/main.c
cvs rdiff -u -r1.20 -r1.21 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/usr.bin/config/defs.h
diff -u src/usr.bin/config/defs.h:1.50 src/usr.bin/config/defs.h:1.51
--- src/usr.bin/config/defs.h:1.50 Thu Oct 9 15:25:26 2014
+++ src/usr.bin/config/defs.h Thu Oct 9 19:20:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.50 2014/10/09 15:25:26 uebayasi Exp $ */
+/* $NetBSD: defs.h,v 1.51 2014/10/09 19:20:56 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -606,6 +606,7 @@ int emitioconfh(void);
int mkioconf(void);
/* mkmakefile.c */
+extern int usekobjs;
int mkmakefile(void);
/* mkswap.c */
Index: src/usr.bin/config/main.c
diff -u src/usr.bin/config/main.c:1.57 src/usr.bin/config/main.c:1.58
--- src/usr.bin/config/main.c:1.57 Thu Oct 9 16:08:36 2014
+++ src/usr.bin/config/main.c Thu Oct 9 19:20:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.57 2014/10/09 16:08:36 uebayasi Exp $ */
+/* $NetBSD: main.c,v 1.58 2014/10/09 19:20:56 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -161,7 +161,7 @@ main(int argc, char **argv)
pflag = 0;
xflag = 0;
- while ((ch = getopt(argc, argv, "D:LPU:dgpvb:s:x")) != -1) {
+ while ((ch = getopt(argc, argv, "D:LMPU:dgpvb:s:x")) != -1) {
switch (ch) {
#ifndef MAKE_BOOTSTRAP
@@ -171,6 +171,10 @@ main(int argc, char **argv)
break;
#endif
+ case 'M':
+ usekobjs = 1;
+ break;
+
case 'L':
Lflag = 1;
break;
Index: src/usr.bin/config/mkmakefile.c
diff -u src/usr.bin/config/mkmakefile.c:1.20 src/usr.bin/config/mkmakefile.c:1.21
--- src/usr.bin/config/mkmakefile.c:1.20 Thu Oct 9 17:36:10 2014
+++ src/usr.bin/config/mkmakefile.c Thu Oct 9 19:20:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: mkmakefile.c,v 1.20 2014/10/09 17:36:10 uebayasi Exp $ */
+/* $NetBSD: mkmakefile.c,v 1.21 2014/10/09 19:20:56 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -83,7 +83,7 @@ static void emitsubs(FILE *, const char
static int selectopt(const char *, void *);
/* Generate Makefile to build things per-attribute *.ko (a.k.a modular build). */
-int usekobjs = 0; /* XXX */
+int usekobjs = 0;
int
mkmakefile(void)
