mirrors/make
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/make.git synced 2025-02-07 14:56:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Formerly main.c.~90~

Browse source
This commit is contained in:
Roland McGrath 1993-07-14 22:56:38 +00:00
parent 2ef2fbe7a4
commit aef2a1ccd0
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
main.c
View file

@ -26,8 +26,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
extern char *version_string; extern char *version_string;
extern struct dep *read_all_makefiles ();
extern void print_variable_data_base (); extern void print_variable_data_base ();
extern void print_dir_data_base (); extern void print_dir_data_base ();
extern void print_rule_data_base (); extern void print_rule_data_base ();
@ -920,7 +918,7 @@ main (argc, argv, envp)
any_remade |= (file_mtime_no_search (d->file) any_remade |= (file_mtime_no_search (d->file)
!= makefile_mtimes[i]); != makefile_mtimes[i]);
} }
else if (d->changed != 1) else if (! (d->changed & RM_DONTCARE))
{ {
time_t mtime; time_t mtime;
/* The update failed and this makefile was not /* The update failed and this makefile was not
@ -934,23 +932,20 @@ main (argc, argv, envp)
} }
else else
/* This makefile was not found at all. */ /* This makefile was not found at all. */
switch (d->changed) if (! (d->changed & RM_DONTCARE))
{ {
case 0: /* This is a makefile we care about. See how much. */
/* A normal makefile. We must die later. */ if (d->changed & RM_INCLUDED)
error ("Makefile `%s' was not found", dep_name (d));
any_failed = 1;
break;
case 1:
/* A makefile from the MAKEFILES variable.
We don't care. */
break;
case 2:
/* An included makefile. We don't need /* An included makefile. We don't need
to die, but we do want to complain. */ to die, but we do want to complain. */
error ("Included makefile `%s' was not found.", error ("Included makefile `%s' was not found.",
dep_name (d)); dep_name (d));
break; else
{
/* A normal makefile. We must die later. */
error ("Makefile `%s' was not found", dep_name (d));
any_failed = 1;
}
} }
free ((char *) d); free ((char *) d);