diff options
| author | Raja R Harinath <harinath@acm.org> | 2003-08-12 23:32:59 +0000 |
|---|---|---|
| committer | Raja R Harinath <harinath@acm.org> | 2003-08-12 23:32:59 +0000 |
| commit | 206ac50a2a2a6a66b090eba7a32c667caf821add (patch) | |
| tree | 5f73e635427615a71becd9b1f54250f747a34bae /lib/Automake/Rule.pm | |
| parent | c5548fdc28d66ad8894a5c3e13f8a74cd2f6234a (diff) | |
| download | automake-206ac50a2a2a6a66b090eba7a32c667caf821add.tar.gz | |
* lib/Automake/Condition.pm (strip): Replace loop with 'grep'.
(not): Replace loop with 'map'.
* lib/Automake/DisjConditions.pm (sub_conditions): Likewise.
* lib/Automake/Item.pm (not_alwasy_defined_in_cond):
Don't 'simplify' result of 'invert', since it's already in
canonical form.
* lib/Automake/Rule.pm (define): Replace loop with
'not_always_defined_in_cond'.
Diffstat (limited to 'lib/Automake/Rule.pm')
| -rw-r--r-- | lib/Automake/Rule.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm index 4bef2b4cb..fd6471d45 100644 --- a/lib/Automake/Rule.pm +++ b/lib/Automake/Rule.pm @@ -740,11 +740,8 @@ sub define ($$$$$) # was already defined in condition COND1 and we want to define # it in condition TRUE, then define it only in condition !COND1. # (See cond14.test and cond15.test for some test cases.) - @conds = (); - for my $undefined_cond ($rule->conditions->invert->conds) - { - push @conds, $cond->merge ($undefined_cond); - } + @conds = $rule->not_always_defined_in_cond ($cond)->conds; + # No conditions left to define the rule. # Warn, because our workaround is meaningless in this case. if (scalar @conds == 0) |