Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
rillig 2020-11-04 13:29:42 +00:00
parent f374fbd233
commit 986c524c55
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/make/main.c
View File

@ -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.

11
usr.bin/make/make.h
View File

@ -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 */