github-repos/make
1
0
Fork 0
mirror of https://github.com/mirror/make.git synced 2024-12-27 13:20:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Terminology change in docs and code.

Browse Source
This commit is contained in:
Paul Smith 1999-08-24 04:49:39 +00:00
parent 5dc4b92b60
commit d0b03e9355
6 changed files with 430 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
1999-08-24 Paul D. Smith <psmith@gnu.org>
* make.texinfo: Change "dependency" to "prerequisite" and
"dependencies" to "prerequisites". Various other cleanups related
to the terminology change.
* file.c: Change debugging and error messages to use
"prerequisite" instead of "dependency".
* implicit.c: Ditto.
* remake.c: Ditto.
* NEWS: Document it.
1999-08-23 Paul D. Smith <psmith@gnu.org>
* remake.c (update_file): Move the considered check into the

4
NEWS
View File

@ -46,6 +46,10 @@ Version 3.78
each other to ensure that no more than N jobs are started across all
makes. To get the old behavior of -j back, you can configure make
with the --disable-job-server option.
* The confusing term "dependency" has been replaced by the more accurate
and standard term "prerequisite", both in the manual and in all GNU make
output.
Version 3.77

6
file.c
View File

@ -620,9 +620,9 @@ print_file (f)
putchar ('\n');
if (f->precious)
puts (_("# Precious file (dependency of .PRECIOUS)."));
puts (_("# Precious file (prerequisite of .PRECIOUS)."));
if (f->phony)
puts (_("# Phony target (dependency of .PHONY)."));
puts (_("# Phony target (prerequisite of .PHONY)."));
if (f->cmd_target)
puts (_("# Command-line target."));
if (f->dontcare)
@ -632,7 +632,7 @@ print_file (f)
if (f->stem != 0)
printf (_("# Implicit/static pattern stem: `%s'\n"), f->stem);
if (f->intermediate)
puts (_("# File is an intermediate dependency."));
puts (_("# File is an intermediate prerequisite."));
if (f->also_make != 0)
{
fputs (_("# Also makes:"), stdout);

9
implicit.c
View File

@ -376,7 +376,7 @@ pattern_search (file, archive, depth, recursions)
"impossible", then the rule fails and don't
bother trying it on the second pass either
since we know that will fail too. */
DEBUGP2 (_("Rejecting impossible %s dependency `%s'.\n"),
DEBUGP2 (_("Rejecting impossible %s prerequisite `%s'.\n"),
p == depname ? _("implicit") : _("rule"), p);
tryrules[i] = 0;
break;
@ -384,7 +384,7 @@ pattern_search (file, archive, depth, recursions)
intermediate_files[deps_found] = 0;
DEBUGP2 (_("Trying %s dependency `%s'.\n"),
DEBUGP2 (_("Trying %s prerequisite `%s'.\n"),
p == depname ? _("implicit") : _("rule"), p);
/* The DEP->changed flag says that this dependency resides in a
@ -408,8 +408,9 @@ pattern_search (file, archive, depth, recursions)
vp = p;
if (vpath_search (&vp, (FILE_TIMESTAMP *) 0))
{
DEBUGP2 (_("Found dependency `%s' as VPATH `%s'\n"), p, vp);
strcpy(vp, p);
DEBUGP2 (_("Found prerequisite `%s' as VPATH `%s'\n"),
p, vp);
strcpy (vp, p);
found_files[deps_found++] = vp;
continue;
}

713
make.texinfo
View File

File diff suppressed because it is too large Load Diff

16
remake.c
View File

@ -452,7 +452,7 @@ update_file_1 (file, depth)
if (d->file->updating)
{
error (NILF, _("Circular %s <- %s dependency dropped."),
error (NILF, _("Circular %s <- %s prerequisite dropped."),
file->name, d->file->name);
/* We cannot free D here because our the caller will still have
a reference to it when we were called recursively via
@ -530,13 +530,13 @@ update_file_1 (file, depth)
file->updating = 0;
DEBUGPR (_("Finished dependencies of target file `%s'.\n"));
DEBUGPR (_("Finished prerequisites of target file `%s'.\n"));
if (running)
{
set_command_state (file, cs_deps_running);
--depth;
DEBUGPR (_("The dependencies of `%s' are being made.\n"));
DEBUGPR (_("The prerequisites of `%s' are being made.\n"));
return 0;
}
@ -598,9 +598,9 @@ update_file_1 (file, depth)
{
print_spaces (depth);
if (d_mtime == (FILE_TIMESTAMP) -1)
printf (_("Dependency `%s' does not exist.\n"), dep_name (d));
printf (_("Prerequisite `%s' does not exist.\n"), dep_name (d));
else
printf (_("Dependency `%s' is %s than dependent `%s'.\n"),
printf (_("Prerequisite `%s' is %s than target `%s'.\n"),
dep_name (d), d->changed ? _("newer") : _("older"), file->name);
fflush (stdout);
}
@ -612,12 +612,12 @@ update_file_1 (file, depth)
if (file->double_colon && file->deps == 0)
{
must_make = 1;
DEBUGPR (_("Target `%s' is double-colon and has no dependencies.\n"));
DEBUGPR (_("Target `%s' is double-colon and has no prerequisites.\n"));
}
else if (!noexist && file->is_target && !deps_changed && file->cmds == 0)
{
must_make = 0;
DEBUGPR (_("No commands for `%s' and no dependencies actually changed.\n"));
DEBUGPR (_("No commands for `%s' and no prerequisites actually changed.\n"));
}
if (!must_make)
@ -851,7 +851,7 @@ check_dep (file, depth, this_mtime, must_make_ptr)
{
if (d->file->updating)
{
error (NILF, _("Circular %s <- %s dependency dropped."),
error (NILF, _("Circular %s <- %s prerequisite dropped."),
file->name, d->file->name);
if (lastd == 0)
{