summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>1999-07-22 04:20:14 +0000
committerPaul Smith <psmith@gnu.org>1999-07-22 04:20:14 +0000
commitec50fe2a2baf518181896a0cc5f376eb4d47ff0a (patch)
tree24a371fa169122d485250f3ed33f79b733de6f95 /main.c
parentc69d4c95bf2027252e13e4dec3fb2dcfd10fc4e7 (diff)
downloadgunmake-ec50fe2a2baf518181896a0cc5f376eb4d47ff0a.tar.gz
* Installed new versions of GLIBC glob library.
* Installed Tim Magill's "graph pruning" performance enhancement. * Update version to 3.77.90 for the release. * Require automake 1.4.
Diffstat (limited to 'main.c')
-rw-r--r--main.c76
1 files changed, 41 insertions, 35 deletions
diff --git a/main.c b/main.c
index f9ba4f4..1950956 100644
--- a/main.c
+++ b/main.c
@@ -1465,45 +1465,51 @@ int main (int argc, char ** argv)
struct dep *d;
for (i = 0, d = read_makefiles; d != 0; ++i, d = d->next)
- if (d->file->updated)
- {
- /* This makefile was updated. */
- if (d->file->update_status == 0)
- {
- /* It was successfully updated. */
- any_remade |= (file_mtime_no_search (d->file)
- != makefile_mtimes[i]);
- }
- else if (! (d->changed & RM_DONTCARE))
- {
- FILE_TIMESTAMP mtime;
- /* The update failed and this makefile was not
- from the MAKEFILES variable, so we care. */
- error (NILF, "Failed to remake makefile `%s'.",
- d->file->name);
- mtime = file_mtime_no_search (d->file);
- any_remade |= (mtime != (FILE_TIMESTAMP) -1
- && mtime != makefile_mtimes[i]);
- }
- }
- else
- /* This makefile was not found at all. */
- if (! (d->changed & RM_DONTCARE))
+ {
+ /* Reset the considered flag; we may need to look at the file
+ again to print an error. */
+ d->file->considered = 0;
+
+ if (d->file->updated)
{
- /* This is a makefile we care about. See how much. */
- if (d->changed & RM_INCLUDED)
- /* An included makefile. We don't need
- to die, but we do want to complain. */
- error (NILF, "Included makefile `%s' was not found.",
- dep_name (d));
- else
+ /* This makefile was updated. */
+ if (d->file->update_status == 0)
{
- /* A normal makefile. We must die later. */
- error (NILF, "Makefile `%s' was not found",
- dep_name (d));
- any_failed = 1;
+ /* It was successfully updated. */
+ any_remade |= (file_mtime_no_search (d->file)
+ != makefile_mtimes[i]);
+ }
+ else if (! (d->changed & RM_DONTCARE))
+ {
+ FILE_TIMESTAMP mtime;
+ /* The update failed and this makefile was not
+ from the MAKEFILES variable, so we care. */
+ error (NILF, "Failed to remake makefile `%s'.",
+ d->file->name);
+ mtime = file_mtime_no_search (d->file);
+ any_remade |= (mtime != (FILE_TIMESTAMP) -1
+ && mtime != makefile_mtimes[i]);
}
}
+ else
+ /* This makefile was not found at all. */
+ if (! (d->changed & RM_DONTCARE))
+ {
+ /* This is a makefile we care about. See how much. */
+ if (d->changed & RM_INCLUDED)
+ /* An included makefile. We don't need
+ to die, but we do want to complain. */
+ error (NILF, "Included makefile `%s' was not found.",
+ dep_name (d));
+ else
+ {
+ /* A normal makefile. We must die later. */
+ error (NILF, "Makefile `%s' was not found",
+ dep_name (d));
+ any_failed = 1;
+ }
+ }
+ }
/* Reset this to empty so we get the right error message below. */
read_makefiles = 0;