Module Name: src
Committed By: rillig
Date: Wed Nov 4 13:29:42 UTC 2020
Modified Files:
src/usr.bin/make: main.c make.h
Log Message:
make(1): move declaration of parseIncPath from main.c to make.h
To generate a diff of this commit:
cvs rdiff -u -r1.424 -r1.425 src/usr.bin/make/main.c
cvs rdiff -u -r1.185 -r1.186 src/usr.bin/make/make.h
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/make/main.c
diff -u src/usr.bin/make/main.c:1.424 src/usr.bin/make/main.c:1.425
--- src/usr.bin/make/main.c:1.424 Wed Nov 4 13:22:15 2020
+++ src/usr.bin/make/main.c Wed Nov 4 13:29:42 2020
@@ -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 @@ int makelevel;
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.
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.185 src/usr.bin/make/make.h:1.186
--- src/usr.bin/make/make.h:1.185 Wed Nov 4 13:22:15 2020
+++ src/usr.bin/make/make.h Wed Nov 4 13:29:42 2020
@@ -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 time_t now; /* The time at the s
*/
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 */
