+2001-04-09 Akim Demaille <akim@epita.fr>
+
+ * automake.in (&handle_source_transform): Use
+ &variable_conditions, don't read $conditional{$var}.
+ (&variable_conditions_sub): When the call is the top level call,
+ generate all the permutations of the conditions.
+
2001-04-09 Akim Demaille <akim@epita.fr>
* depend2.am (@AMDEP@%FPFX%DEPMODE): Define it when GENERIC so
* tests/vartar.test: s/INSTALL/install/g, automake now complains
because we defined INSTALL.
-
2001-04-09 Akim Demaille <akim@epita.fr>
* automake.in (&generate_makefile) Use macro_define to define
unless $prefix =~ /EXTRA_/;
push (@dist_sources, '$(' . $prefix . $one_file . "_SOURCES)")
unless $prefix =~ /^nodist_/;
- variable_dump ($var);
- foreach my $cond (keys %{$conditional{$var}})
+ foreach my $cond (variable_conditions ($var))
{
@files = &variable_value_as_list ($var, $cond);
($temp, @result) =
push (@objects, $unxformed . $obj);
push (@files, $unxformed . '.c');
- ($temp, @result) = &handle_single_transform_list ($one_file . '_SOURCES',
- $one_file, $obj,
- @files);
+ ($temp, @result) =
+ &handle_single_transform_list ($one_file . '_SOURCES',
+ $one_file, $obj,
+ @files);
$linker = $temp if $linker eq '';
&define_pretty_variable ($one_file . "_OBJECTS", '', @result)
}
# definitions.
delete $vars_scanned{$var};
- return @new_conds
- if ! $parent;
+ # If there are no parents, then this call is the top level call.
+ if (! $parent)
+ {
+ # Now we want to return all permutations of the subvariable
+ # conditions.
+ my %allconds = ();
+ foreach my $item (@new_conds)
+ {
+ foreach (split (' ', $item))
+ {
+ s/^(.*)_(TRUE|FALSE)$/$1_TRUE/;
+ $allconds{$_} = 1;
+ }
+ }
+ return &variable_conditions_permutations (sort keys %allconds);
+ }
# If we are being called on behalf of another variable, we need to
# return all possible permutations of the conditions. We have
if $done{$var};
$done{$var} = 1;
- variable_dump ($var);
# Don't process Automake variables.
next
if $var_is_am{$var};