From 74b8ef79b14db016ad9b630319b6d28559b3d14f Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Mon, 4 Feb 2013 18:53:50 +0000 Subject: [PATCH] At least as I read http://www.gnu.org/software/automake/manual/automake.html#index-g_t_0040code_007bAM_005fDEFAULT_005fVERBOSITY_007d-1018 this is the way to do the silent-rules stuff; using nested variable expansion in Makefile.am causes warnings when running autogen.sh. svn path=/trunk/; revision=47474 --- Makefile.am | 4 ++-- doc/Makefile.am | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index cc33a7a4d7..8a40d51d99 100644 --- a/Makefile.am +++ b/Makefile.am @@ -545,8 +545,8 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/wiretap \ # FORCE is the portable version of .PHONY FORCE: -AM_V_PERL = $(am__v_PERL_$(V)) -am__v_PERL_ = $(am__v_PERL_$(AM_DEFAULT_VERBOSITY)) +AM_V_PERL = $(am__v_PERL_@AM_V@) +am__v_PERL_ = $(am__v_PERL_@AM_DEFAULT_V@) am__v_PERL_0 = @echo " PERL " $@; am__v_PERL_1 = diff --git a/doc/Makefile.am b/doc/Makefile.am index 38df006037..f24e49c031 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -109,13 +109,13 @@ AUTHORS-SHORT-FORMAT: ../AUTHORS-SHORT $(srcdir)/make-authors-format.pl wireshark.pod: $(srcdir)/wireshark.pod.template AUTHORS-SHORT-FORMAT $(AM_V_GEN)cat $(srcdir)/wireshark.pod.template AUTHORS-SHORT-FORMAT > wireshark.pod -AM_V_POD2MAN = $(am__v_POD2MAN_$(V)) -am__v_POD2MAN_ = $(am__v_POD2MAN_$(AM_DEFAULT_VERBOSITY)) +AM_V_POD2MAN = $(am__v_POD2MAN_@AM_V@) +am__v_POD2MAN_ = $(am__v_POD2MAN_@AM_DEFAULT_V@) am__v_POD2MAN_0 = @echo " POD2MAN " $@; am__v_POD2MAN_1 = -AM_V_POD2HTML = $(am__v_POD2HTML_$(V)) -am__v_POD2HTML_ = $(am__v_POD2HTML_$(AM_DEFAULT_VERBOSITY)) +AM_V_POD2HTML = $(am__v_POD2HTML_@AM_V@) +am__v_POD2HTML_ = $(am__v_POD2HTML_@AM_DEFAULT_V@) am__v_POD2HTML_0 = @echo " POD2HTML" $@; am__v_POD2HTML_1 =