mirrors/make-dfsg
1
0
Fork 0
mirror of https://salsa.debian.org/srivasta/make-dfsg.git synced 2024-12-25 05:29:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Formerly read.c.~66~

Browse source
This commit is contained in:
Roland McGrath 1993-07-15 02:25:00 +00:00
parent 7a031cd4b2
commit f0929a13c3
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
read.c
View file

@ -143,7 +143,7 @@ read_all_makefiles (makefiles)
{ {
if (*p != '\0') if (*p != '\0')
*p++ = '\0'; *p++ = '\0';
read_makefile (name, 1); read_makefile (name, RM_NO_DEFAULT_GOAL | RM_INCLUDED | RM_DONTCARE);
} }
free (value); free (value);
@ -503,17 +503,22 @@ read_makefile (filename, flags)
v->export = v_noexport; v->export = v_noexport;
} }
} }
else if (word1eq ("include", 7)) else if (word1eq ("include", 7) || word1eq ("-include", 8))
{ {
/* We have found an `include' line specifying a nested /* We have found an `include' line specifying a nested
makefile to be read at this point. */ makefile to be read at this point. */
struct conditionals *save, new_conditionals; struct conditionals *save, new_conditionals;
struct nameseq *files; struct nameseq *files;
/* "-include" (vs "include") says no
error if the file does not exist. */
int noerror = p[0] == '-';
p = allocated_variable_expand (next_token (p + 8)); p = allocated_variable_expand (next_token (p + (noerror ? 9 : 8)));
if (*p == '\0') if (*p == '\0')
{ {
makefile_error (filename, lineno, "no file name for `include'"); makefile_error (filename, lineno,
"no file name for `%sinclude'",
noerror ? "-" : "");
continue; continue;
} }
@ -543,7 +548,8 @@ read_makefile (filename, flags)
free (files); free (files);
files = next; files = next;
read_makefile (name, 2); read_makefile (name, (RM_INCLUDED | RM_NO_TILDE
| (noerror ? RM_DONTCARE : 0)));
} }
/* Restore state. */ /* Restore state. */