mirror of
https://git.savannah.gnu.org/git/make.git
synced 2024-11-25 12:37:04 +00:00
Formerly main.c.~90~
This commit is contained in:
parent
2ef2fbe7a4
commit
aef2a1ccd0
1 changed files with 14 additions and 19 deletions
33
main.c
33
main.c
|
@ -26,8 +26,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
|
|||
|
||||
extern char *version_string;
|
||||
|
||||
extern struct dep *read_all_makefiles ();
|
||||
|
||||
extern void print_variable_data_base ();
|
||||
extern void print_dir_data_base ();
|
||||
extern void print_rule_data_base ();
|
||||
|
@ -920,7 +918,7 @@ main (argc, argv, envp)
|
|||
any_remade |= (file_mtime_no_search (d->file)
|
||||
!= makefile_mtimes[i]);
|
||||
}
|
||||
else if (d->changed != 1)
|
||||
else if (! (d->changed & RM_DONTCARE))
|
||||
{
|
||||
time_t mtime;
|
||||
/* The update failed and this makefile was not
|
||||
|
@ -934,23 +932,20 @@ main (argc, argv, envp)
|
|||
}
|
||||
else
|
||||
/* This makefile was not found at all. */
|
||||
switch (d->changed)
|
||||
if (! (d->changed & RM_DONTCARE))
|
||||
{
|
||||
case 0:
|
||||
/* A normal makefile. We must die later. */
|
||||
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
|
||||
to die, but we do want to complain. */
|
||||
error ("Included makefile `%s' was not found.",
|
||||
dep_name (d));
|
||||
break;
|
||||
/* 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 ("Included makefile `%s' was not found.",
|
||||
dep_name (d));
|
||||
else
|
||||
{
|
||||
/* A normal makefile. We must die later. */
|
||||
error ("Makefile `%s' was not found", dep_name (d));
|
||||
any_failed = 1;
|
||||
}
|
||||
}
|
||||
|
||||
free ((char *) d);
|
||||
|
|
Loading…
Reference in a new issue