* automake.in (&conditional_dump): Rename as...

(&variables_dump): this.  Use...
(&variable_dump): this new sub.

diff --git a/ChangeLog b/ChangeLog
index 02ce4b1f6f3f31cdd713c0f23ec8675ae6491c26..9810a6e2388a01b38831a65bda5845d64378ddcb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-03-23  Akim Demaille  <akim@epita.fr>
+
+       * automake.in (&conditional_dump): Rename as...
+       (&variables_dump): this.  Use...
+       (&variable_dump): this new sub.
+
+       
 2001-03-23  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&file_contents): Maintain $cond_string sync with

diff --git a/automake.in b/automake.in
index b5208a371ff98d82116591c7d3aa9d13c092758c..c17e68fc858feef3c71e53aa64ae22d797889edb 100755 (executable)
--- 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";
 }