diff options
| author | rillig <rillig@NetBSD.org> | 2020-11-04 13:29:42 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2020-11-04 13:29:42 +0000 |
| commit | 7ae11e6eeceec8bc0e35e0ce0acfced0f7a186c8 (patch) | |
| tree | 038710033d9a6fa5e4783f3de848da9e57ae61db | |
| parent | 0485f461461e06947355f5c0e5b937a9738529f1 (diff) | |
make(1): move declaration of parseIncPath from main.c to make.h
| -rw-r--r-- | usr.bin/make/main.c | 6 | ||||
| -rw-r--r-- | usr.bin/make/make.h | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index f04db7603e5..007e81a7698 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -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. diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h index e531406ff69..64fdb65c1f1 100644 --- a/usr.bin/make/make.h +++ b/usr.bin/make/make.h @@ -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 start of this whole */ 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 */ |
