aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>1992-03-24 09:50:46 +0000
committerRoland McGrath <roland@redhat.com>1992-03-24 09:50:46 +0000
commitd922934cf80c9f50a3e2243ffb326eea829b2047 (patch)
treea269728803ca9f258aebcb0c79b18667f99df08e
parent39d4bb0c7a77f9f35cb7a705d0e8f5cffb9ee871 (diff)
downloadgunmake-d922934cf80c9f50a3e2243ffb326eea829b2047.tar.gz
Formerly rule.c.~2~
-rw-r--r--rule.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/rule.c b/rule.c
index 02302b0..0a54f7d 100644
--- a/rule.c
+++ b/rule.c
@@ -1,5 +1,5 @@
/* Pattern and suffix rule internals for GNU Make.
-Copyright (C) 1988, 1989, 1990, 1991 Free Software Foundation, Inc.
+Copyright (C) 1988, 1989, 1990, 1991, 1992 Free Software Foundation, Inc.
This file is part of GNU Make.
GNU Make is free software; you can redistribute it and/or modify
@@ -254,8 +254,12 @@ new_pattern_rule (rule, override)
lastrule = pattern_rules;
for (r = pattern_rules; r != 0; lastrule = r, r = r->next)
for (i = 0; rule->targets[i] != 0; ++i)
- for (j = 0; r->targets[j] != 0; ++j)
- if (streq (rule->targets[i], r->targets[j]))
+ {
+ for (j = 0; r->targets[j] != 0; ++j)
+ if (!streq (rule->targets[i], r->targets[j]))
+ break;
+ if (r->targets[j] == 0)
+ /* All the targets matched. */
{
register struct dep *d, *d2;
for (d = rule->deps, d2 = r->deps;
@@ -274,7 +278,7 @@ new_pattern_rule (rule, override)
else
last_pattern_rule->next = rule;
last_pattern_rule = rule;
-
+
/* We got one. Stop looking. */
goto matched;
}
@@ -285,6 +289,7 @@ new_pattern_rule (rule, override)
return 0;
}
}
+ }
matched:;