From 0364b1abb8cfc57362325ca8a69371b3a27f4026 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 23 Mar 2001 17:03:19 +0000 Subject: [PATCH] * automake.in (&conditional_dump): Rename as... (&variables_dump): this. Use... (&variable_dump): this new sub. --- ChangeLog | 7 +++++++ automake.in | 44 +++++++++++++++++++++++++++++++++----------- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 02ce4b1..9810a6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2001-03-23 Akim Demaille + * automake.in (&conditional_dump): Rename as... + (&variables_dump): this. Use... + (&variable_dump): this new sub. + + +2001-03-23 Akim Demaille + * automake.in (&file_contents): Maintain $cond_string sync with @cond_stack. Output rules only if not under `FALSE'. diff --git a/automake.in b/automake.in index b5208a3..c17e68f 100755 --- a/automake.in +++ b/automake.in @@ -5494,21 +5494,43 @@ sub make_condition } -# &conditional_dump -# ----------------- -sub conditional_dump () +# &variable_dump ($VAR) +# --------------------- +sub variable_dump ($) { - print STDERR "%conditional =\n"; - print STDERR "{\n"; + my ($var)= @_; + + my $var_is_am = $var_is_am{$var} ? "Automake" : "User"; + my $where = (defined $content_lines{$var} + ? $content_lines{$var} : "undefined"); + my $pluseq = ((defined $var_was_plus_eq{$var} && $var_was_plus_eq{$var}) + ? "+=" : "="); + + print STDERR " $var ($var_is_am, where = $where) $pluseq\n"; + print STDERR " {\n"; + print STDERR " (TRUE) => $contents{$var}\n"; foreach my $var (sort keys %conditional) { - print STDERR " $var = \n"; - print STDERR " {\n"; foreach my $vcond (sort by_condition keys %{$conditional{$var}}) - { - print STDERR " $vcond => $conditional{$var}{$vcond}\n"; - } - print STDERR " }\n"; + { + print STDERR " $vcond => $conditional{$var}{$vcond}\n"; + } + } + print STDERR " }\n"; +} + + +# &variables_dump () +# ------------------ +sub variables_dump () +{ + my ($var)= @_; + + print STDERR "%contents =\n"; + print STDERR "{\n"; + foreach my $var (sort (keys %contents, keys %conditional)) + { + variable_dump ($var); } print STDERR "}\n"; } -- 2.7.4