summaryrefslogtreecommitdiff
path: root/usr.bin/make/main.c
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2002-03-02 00:23:15 +0000
committerMarc Espie <espie@cvs.openbsd.org>2002-03-02 00:23:15 +0000
commit8947d29f92fe14e732c743a3d75d85cb985c26a8 (patch)
tree3f9afea0f06857af33ea6f21f09e49840fb46838 /usr.bin/make/main.c
parent0d4a6640be13ed7998e5d4d10be2ccfa6101a2cf (diff)
kill #ifdef REMOTE stuff that only obfuscates issues.
ok millert@, miod@
Diffstat (limited to 'usr.bin/make/main.c')
-rw-r--r--usr.bin/make/main.c27
1 files changed, 1 insertions, 26 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index 1be8e27b55e..50be409f71c 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,5 +1,5 @@
/* $OpenPackages$ */
-/* $OpenBSD: main.c,v 1.56 2001/11/11 12:35:02 espie Exp $ */
+/* $OpenBSD: main.c,v 1.57 2002/03/02 00:23:14 espie Exp $ */
/* $NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $ */
/*
@@ -200,11 +200,7 @@ MainParseArgs(argc, argv)
int forceJobs = 0;
optind = 1; /* since we're called more than once */
-#ifdef REMOTE
-# define OPTFLAGS "BD:I:L:PSV:d:ef:ij:km:nqrst"
-#else
# define OPTFLAGS "BD:I:PSV:d:ef:ij:km:nqrst"
-#endif
# define OPTLETTERS "BPSiknqrst"
rearg: while ((c = getopt(argc, argv, OPTFLAGS)) != -1) {
switch (c) {
@@ -220,21 +216,6 @@ rearg: while ((c = getopt(argc, argv, OPTFLAGS)) != -1) {
Lst_AtEnd(&varstoprint, optarg);
record_option(c, optarg);
break;
-#ifdef REMOTE
- case 'L': {
- char *endptr;
-
- maxLocal = strtol(optarg, &endptr, 0);
- if (endptr == optarg) {
- fprintf(stderr,
- "make: illegal argument to -L option -- %s -- not a number\n",
- optarg);
- usage();
- }
- record_option(c, optend);
- break;
- }
-#endif
case 'd': {
char *modules = optarg;
@@ -307,9 +288,7 @@ rearg: while ((c = getopt(argc, argv, OPTFLAGS)) != -1) {
usage();
}
maxJobs = atoi(optarg);
-#ifndef REMOTE
maxLocal = maxJobs;
-#endif
record_option(c, optarg);
break;
}
@@ -604,11 +583,7 @@ main(argc, argv)
debug = 0; /* No debug verbosity, please. */
maxLocal = DEFMAXLOCAL; /* Set default local max concurrency */
-#ifdef REMOTE
- maxJobs = DEFMAXJOBS; /* Set default max concurrency */
-#else
maxJobs = maxLocal;
-#endif
compatMake = false; /* No compat mode */