diff options
| author | Steve Price <steve@FreeBSD.org> | 1996-10-06 02:35:38 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1996-10-06 02:35:38 +0000 |
| commit | c0d06fe46307038927b1e161cbb4d3f4527ac669 (patch) | |
| tree | ab5bd5270becce85fa203b4b54d26c39fa7c14bc /usr.bin/make/make.h | |
| parent | 81beb58a1ae55112cf28eb7227f5ca2940d84271 (diff) | |
| download | src-c0d06fe46307038927b1e161cbb4d3f4527ac669.tar.gz src-c0d06fe46307038927b1e161cbb4d3f4527ac669.zip | |
Merge in NetBSD's changes to make(1). Changes include:
- Add the .PHONY, .PARALLEL, and .WAIT directives
- Added the -B and -m commandline flags
- misc. man page cleanups
- numerous job-related enhancements
- removed unused header file (bit.h)
- add util.c for functions not found in other envs.
- and a few coordinated whitespace changes
Special thanks to Christos Zoulas <christos@netbsd.org>
for help in the merge. A 'diff -ur' between Net and
FreeBSD now only contains sccsid-related diffs. :)
Obtained from: NetBSD, christos@netbsd.org, and me
Notes
Notes:
svn path=/head/; revision=18730
Diffstat (limited to 'usr.bin/make/make.h')
| -rw-r--r-- | usr.bin/make/make.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h index cdc795099082..249d025a2edd 100644 --- a/usr.bin/make/make.h +++ b/usr.bin/make/make.h @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)make.h 8.1 (Berkeley) 6/6/93 + * from: @(#)make.h 8.3 (Berkeley) 6/13/95 */ /*- @@ -50,15 +50,17 @@ #include <stdio.h> #include <string.h> #include <ctype.h> -#ifndef MAKE_BOOTSTRAP +#if !defined(MAKE_BOOTSTRAP) && defined(BSD) #include <sys/cdefs.h> #else +#ifndef __P #if defined(__STDC__) || defined(__cplusplus) #define __P(protos) protos /* full-blown ANSI C */ #else #define __P(protos) () /* traditional C preprocessor */ #endif #endif +#endif #if __STDC__ #include <stdlib.h> #include <unistd.h> @@ -100,6 +102,7 @@ typedef struct GNode { char *name; /* The target's name */ char *path; /* The full pathname of the file */ int type; /* Its type (see the OP flags, below) */ + int order; /* Its wait weight */ Boolean make; /* TRUE if this target needs to be remade */ enum { @@ -192,6 +195,7 @@ typedef struct GNode { * local variables. */ #define OP_NOTMAIN 0x00008000 /* The node is exempt from normal 'main * target' processing in parse.c */ +#define OP_PHONY 0x00010000 /* Not a file target; run always */ /* Attributes applied by PMake */ #define OP_TRANSFORM 0x80000000 /* The node is a transformation rule */ #define OP_MEMBER 0x40000000 /* Target is a member of an archive */ @@ -322,6 +326,8 @@ extern time_t now; /* The time at the start of this whole extern Boolean oldVars; /* Do old-style variable substitution */ +extern Lst sysIncPath; /* The system include path. */ + /* * debug control: * There is one bit per module. It is up to the module what debug |