[src/trunk]: src/usr.bin/make make(1): remove DEFMAXLOCAL and DEFMAXJOBS

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

details:   https://anonhg.NetBSD.org/src/rev/e2e30fc7de6e
branches:  trunk
changeset: 957802:e2e30fc7de6e
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Dec 11 22:48:31 2020 +0000

description:
make(1): remove DEFMAXLOCAL and DEFMAXJOBS

These have been hard-wired all the time.  The word LOCAL doesn't make
sense anymore since the code for running jobs remotely has gone.

diffstat:

 usr.bin/make/config.h |  15 +--------------
 usr.bin/make/main.c   |  10 +++-------
 2 files changed, 4 insertions(+), 21 deletions(-)

diffs (66 lines):

diff -r f491aa0e32e5 -r e2e30fc7de6e usr.bin/make/config.h
--- a/usr.bin/make/config.h     Fri Dec 11 22:42:31 2020 +0000
+++ b/usr.bin/make/config.h     Fri Dec 11 22:48:31 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: config.h,v 1.26 2020/11/29 09:27:40 rillig Exp $       */
+/*     $NetBSD: config.h,v 1.27 2020/12/11 22:48:31 rillig Exp $       */
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -73,19 +73,6 @@
  */
 
 /*
- * DEFMAXJOBS
- * DEFMAXLOCAL
- *     These control the default concurrency. On no occasion will more
- *     than DEFMAXJOBS targets be created at once (locally or remotely).
- *
- *     DEFMAXLOCAL is the highest number of targets which will be
- *     created on the local machine at once. Note that if you set this
- *     to 0, nothing will ever happen.
- */
-#define DEFMAXJOBS     4
-#define DEFMAXLOCAL    1
-
-/*
  * INCLUDES
  * LIBRARIES
  *     These control the handling of the .INCLUDES and .LIBS variables.
diff -r f491aa0e32e5 -r e2e30fc7de6e usr.bin/make/main.c
--- a/usr.bin/make/main.c       Fri Dec 11 22:42:31 2020 +0000
+++ b/usr.bin/make/main.c       Fri Dec 11 22:48:31 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.492 2020/12/05 18:38:02 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.493 2020/12/11 22:48:31 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -109,17 +109,13 @@
 #include "trace.h"
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.492 2020/12/05 18:38:02 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.493 2020/12/11 22:48:31 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
            "All rights reserved.");
 #endif
 
-#ifndef DEFMAXLOCAL
-#define DEFMAXLOCAL DEFMAXJOBS
-#endif
-
 CmdOpts opts;
 time_t now;                    /* Time at start of make */
 GNode *defaultNode;            /* .DEFAULT node */
@@ -1128,7 +1124,7 @@
        opts.checkEnvFirst = FALSE;
        Lst_Init(&opts.makefiles);
        opts.ignoreErrors = FALSE;      /* Pay attention to non-zero returns */
-       opts.maxJobs = DEFMAXLOCAL;     /* Set default local max concurrency */
+       opts.maxJobs = 1;
        opts.keepgoing = FALSE;         /* Stop on error */
        opts.noRecursiveExecute = FALSE; /* Execute all .MAKE targets */
        opts.noExecute = FALSE;         /* Execute all commands */