diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-11 12:48:29 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-06-11 12:48:29 +0200 |
| commit | 1f009dac2de393da1010a02a678131fac40d496d (patch) | |
| tree | 62e79bb670b32761fc5dde2f9016049e2ebf6637 | |
| parent | 98b96fccc5df7166a0efc02881a13fbb84e29af6 (diff) | |
| download | automake-1f009dac2de393da1010a02a678131fac40d496d.tar.gz | |
refactor: &define_verbose_var: accept a third optional argument
This is only required by future changes.
* automake.in (define_verbose_var): Accept a third optional argument,
specifying the value to assign to the given make variable when silent
rules are disabled.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| -rw-r--r-- | automake.in | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/automake.in b/automake.in index 5cf5a2c16..5d777c1d0 100644 --- a/automake.in +++ b/automake.in @@ -1138,15 +1138,19 @@ sub verbose_private_var ($) return 'am__v_' . $name; } -# define_verbose_var (NAME, VAL) -# ------------------------------ -# For 'silent-rules' mode, setup VAR and dispatcher, to expand to VAL if silent. -sub define_verbose_var ($$) -{ - my ($name, $val) = @_; +# define_verbose_var (NAME, VAL-IF-SILENT, [VAL-IF-VERBOSE]) +# ---------------------------------------------------------- +# For 'silent-rules' mode, setup VAR and dispatcher, to expand to +# VAL-IF-SILENT if silent, to VAL-IF-VERBOSE (defaulting to empty) +# if not. +sub define_verbose_var ($$;$) +{ + my ($name, $silent_val, $verbose_val) = @_; + $verbose_val = '' unless defined $verbose_val; my $var = verbose_var ($name); my $pvar = verbose_private_var ($name); my $silent_var = $pvar . '_0'; + my $verbose_var = $pvar . '_1'; if (option 'silent-rules') { # For typical 'make's, 'configure' replaces AM_V (inside @@) with $(V) @@ -1155,10 +1159,13 @@ sub define_verbose_var ($$) # See AM_SILENT_RULES in m4/silent.m4. define_variable ($var, '$(' . $pvar . '_@'.'AM_V'.'@)', INTERNAL); define_variable ($pvar . '_', '$(' . $pvar . '_@'.'AM_DEFAULT_V'.'@)', INTERNAL); - Automake::Variable::define ($silent_var, VAR_AUTOMAKE, '', TRUE, $val, - '', INTERNAL, VAR_ASIS) + Automake::Variable::define ($silent_var, VAR_AUTOMAKE, '', TRUE, + $silent_val, '', INTERNAL, VAR_ASIS) if (! vardef ($silent_var, TRUE)); - } + Automake::Variable::define ($verbose_var, VAR_AUTOMAKE, '', TRUE, + $verbose_val, '', INTERNAL, VAR_ASIS) + if (! vardef ($verbose_var, TRUE)); +} } # Above should not be needed in the general automake code. |