[src/trunk]: src/usr.bin/make make(1): move declaration of parseIncPath from ...

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

details:   https://anonhg.NetBSD.org/src/rev/0671f687384b
branches:  trunk
changeset: 945692:0671f687384b
user:      rillig <rillig%NetBSD.org@localhost>
date:      Wed Nov 04 13:29:42 2020 +0000

description:
make(1): move declaration of parseIncPath from main.c to make.h

diffstat:

 usr.bin/make/main.c |   6 ++----
 usr.bin/make/make.h |  11 ++++++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r b656be3d723d -r 0671f687384b usr.bin/make/main.c
--- a/usr.bin/make/main.c       Wed Nov 04 13:27:00 2020 +0000
+++ b/usr.bin/make/main.c       Wed Nov 04 13:29:42 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.424 2020/11/04 13:22:15 rillig Exp $        */
+/*     $NetBSD: main.c,v 1.425 2020/11/04 13:29:42 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -118,7 +118,7 @@
 #include "trace.h"
 
 /*     "@(#)main.c     8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.424 2020/11/04 13:22:15 rillig Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.425 2020/11/04 13:29:42 rillig Exp $");
 #if defined(MAKE_NATIVE) && !defined(lint)
 __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
            "The Regents of the University of California.  "
@@ -158,8 +158,6 @@
 Boolean forceJobs = FALSE;
 static int errors = 0;
 
-extern SearchPath *parseIncPath;
-
 /*
  * For compatibility with the POSIX version of MAKEFLAGS that includes
  * all the options with out -, convert flags to -f -l -a -g -s.
diff -r b656be3d723d -r 0671f687384b usr.bin/make/make.h
--- a/usr.bin/make/make.h       Wed Nov 04 13:27:00 2020 +0000
+++ b/usr.bin/make/make.h       Wed Nov 04 13:29:42 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: make.h,v 1.185 2020/11/04 13:22:15 rillig Exp $        */
+/*     $NetBSD: make.h,v 1.186 2020/11/04 13:29:42 rillig Exp $        */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -452,8 +452,13 @@
  */
 extern Boolean preserveUndefined;
 
-extern SearchPath *sysIncPath; /* The system include path. */
-extern SearchPath *defSysIncPath; /* The default system include path. */
+/* Used for .include "...". */
+extern SearchPath *parseIncPath;
+/* Used for .include <...>, for the built-in sys.mk and makefiles from the
+ * command line arguments. */
+extern SearchPath *sysIncPath;
+/* The default for sysIncPath. */
+extern SearchPath *defSysIncPath;
 
 extern char    curdir[];       /* Startup directory */
 extern char    *progname;      /* The program name */