diff options
author | phk <phk@FreeBSD.org> | 2005-09-26 20:31:00 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2005-09-26 20:31:00 +0000 |
commit | 87620dae7558e911f0092874fdc8fd90e4ff933a (patch) | |
tree | 4f55db457e21d4349b7ca39ce5dce6880c4d7400 /usr.bin | |
parent | bedcd4ace8e6c1ce8c4308a2e5dd2e0a92d9ac06 (diff) | |
download | FreeBSD-src-87620dae7558e911f0092874fdc8fd90e4ff933a.zip FreeBSD-src-87620dae7558e911f0092874fdc8fd90e4ff933a.tar.gz |
Add a .sinclude directive which does the exact same as .include, except
whine when the file cannot be found and opened.
Diffstat (limited to 'usr.bin')
-rw-r--r-- | usr.bin/make/Makefile | 2 | ||||
-rw-r--r-- | usr.bin/make/hash_tables.c | 34 | ||||
-rw-r--r-- | usr.bin/make/make.1 | 10 | ||||
-rw-r--r-- | usr.bin/make/parse.c | 19 |
4 files changed, 45 insertions, 20 deletions
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index ba0d20e..afd065f 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -17,6 +17,8 @@ CFLAGS+=-DMAKE_VERSION=\"5200408120\" CFLAGS+=-D__FBSDID=__RCSID .endif +.sinclude <foobarbarf> + # There is no obvious performance improvement currently. # CFLAGS+=-DUSE_KQUEUE diff --git a/usr.bin/make/hash_tables.c b/usr.bin/make/hash_tables.c index 5436326..27fdf2d 100644 --- a/usr.bin/make/hash_tables.c +++ b/usr.bin/make/hash_tables.c @@ -1,7 +1,7 @@ /* * DO NOT EDIT * $FreeBSD$ - * auto-generated from FreeBSD: src/usr.bin/make/parse.c,v 1.100 2005/04/29 15:15:28 harti Exp + * auto-generated from FreeBSD: src/usr.bin/make/parse.c,v 1.108 2005/05/24 15:30:03 harti Exp * DO NOT EDIT */ #include <sys/types.h> @@ -10,8 +10,8 @@ /* * d=2 - * n=38 - * m=18 + * n=40 + * m=19 * c=2.09 * maxlen=1 * minklen=2 @@ -19,27 +19,27 @@ * minchar=97 * maxchar=119 * loop=0 - * numiter=2 + * numiter=1 * seed= */ static const signed char directive_g[] = { - 16, 0, -1, 14, 5, 2, 2, -1, 0, 0, - -1, -1, 16, 11, -1, 15, -1, 14, 7, -1, - 8, 6, 1, -1, -1, 0, 4, 6, -1, 0, - 0, 2, 0, 13, -1, 14, -1, 0, + 8, 0, 0, 5, 6, -1, 17, 15, 10, 6, + -1, -1, 10, 0, 0, -1, 18, 2, 3, 0, + 7, -1, -1, -1, 0, 14, -1, -1, 11, 16, + -1, -1, 0, -1, 0, 0, 17, 0, -1, 1, }; static const u_char directive_T0[] = { - 11, 25, 14, 30, 14, 26, 23, 15, 9, 37, - 27, 32, 27, 1, 17, 27, 35, 13, 8, 22, - 8, 28, 7, + 26, 14, 19, 35, 10, 34, 18, 27, 1, 17, + 22, 37, 12, 12, 36, 21, 0, 6, 1, 25, + 9, 4, 19, }; static const u_char directive_T1[] = { - 19, 20, 31, 17, 29, 2, 7, 12, 1, 31, - 11, 18, 11, 20, 10, 2, 15, 19, 4, 10, - 13, 36, 3, + 25, 22, 19, 0, 2, 18, 33, 18, 30, 4, + 30, 9, 21, 19, 16, 12, 35, 34, 4, 19, + 9, 33, 16, }; @@ -59,10 +59,10 @@ directive_hash(const u_char *key, size_t len) f1 += directive_T1[-97 + *kp]; } - f0 %= 38; - f1 %= 38; + f0 %= 40; + f1 %= 40; - return (directive_g[f0] + directive_g[f1]) % 18; + return (directive_g[f0] + directive_g[f1]) % 19; } /* * d=2 diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1 index 29f74ac..20506db 100644 --- a/usr.bin/make/make.1 +++ b/usr.bin/make/make.1 @@ -578,8 +578,10 @@ to the canonical path given by As .Nm reads various makefiles, including the default files and any -obtained from the command line and +obtained from the command line .Ic .include +and +.Ic .sinclude directives, their names will be automatically appended to the .Va .MAKEFILE_LIST variable. @@ -836,6 +838,12 @@ makefile's directory and any directories specified using the .Fl I option are searched before the system makefile directory. +The +.It Ic \&.sinclude Ar <file> +.It Ic \&.sinclude Ar \*qfile\*q +Like +.Ic .include , +but silently ignored if the file cannot be found and opened. .It Ic .undef Ar variable Un-define the specified global variable. Only global variables may be un-defined. diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index 4d66103..dda7afd 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -239,6 +239,7 @@ static const struct keyword { #define NKEYWORDS (sizeof(parseKeywords) / sizeof(parseKeywords[0])) static void parse_include(char *, int, int); +static void parse_sinclude(char *, int, int); static void parse_message(char *, int, int); static void parse_undef(char *, int, int); static void parse_for(char *, int, int); @@ -267,6 +268,7 @@ static const struct directive { { "ifndef", COND_IFNDEF, TRUE, Cond_If }, { "ifnmake", COND_IFNMAKE, TRUE, Cond_If }, { "include", 0, FALSE, parse_include }, + { "sinclude", 0, FALSE, parse_sinclude }, { "undef", 0, FALSE, parse_undef }, { "warning", 0, FALSE, parse_message }, /* DIRECTIVES-END-TAG */ @@ -2065,7 +2067,7 @@ ParseFinishLine(void) * options */ static void -parse_include(char *file, int code __unused, int lineno __unused) +xparse_include(char *file, int sinclude) { char *fullname; /* full pathname of file */ char endc; /* the character which ends the file spec */ @@ -2181,7 +2183,8 @@ parse_include(char *file, int code __unused, int lineno __unused) if (fullname == NULL) { *cp = endc; - Parse_Error(PARSE_FATAL, "Could not find %s", file); + if (!sinclude) + Parse_Error(PARSE_FATAL, "Could not find %s", file); free(file); return; } @@ -2195,6 +2198,18 @@ parse_include(char *file, int code __unused, int lineno __unused) ParsePushInput(fullname, NULL, NULL, 0); } +static void +parse_include(char *file, int code __unused, int lineno __unused) +{ + xparse_include(file, 0); +} + +static void +parse_sinclude(char *file, int code __unused, int lineno __unused) +{ + xparse_include(file, 1); +} + /** * parse_message * Parse a .warning or .error directive |