Hi,
I toss this patch here, into the Public Domain; the hell with all the
legalese, just do whatever you want with it.
(Let this mail plus gpg sig be authorization; lkml does it similar
and imho much easier.) Grab the © as you see fit.
And now, enjoy the patch.
Thanks,
Jan
----
Signature for the patch lines between the === markers (/===\n(.*\n)===\n)/:
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
iD8DBQBGpj0Q92gFgoRMQ2ARAgE8AJ9wBNXYygjaFsq35WzG+bXmvJ4EGACfUolX
s75fhDsCLlvimyksUSyL1/Y=
=Rrj2
-----END PGP SIGNATURE-----
===
lib/am/depend2.am has an interesting paragraph about verbosity. I find
automake, in its default behavior, too verbose.
Compiler warnings often get lost in the usual automake chatter, which is no
less than 9 lines (on an 80x25 screen/xterm) per object file in a typical
project such as pam_mount[1]. Add another 6 lines because libtool likes to echo
the whole command. Paging through output with `less` helps a bit (reduces
output to 3 lines, including libtool), but it is still cluttered.
This patch silences automake, for registered languages, to a level that is
comparable to the tranquility found in the output of the Linux Kernel build
infrastructure [kbuild]. That is, in default mode, you will see one line per
object file, "CC output.o", only. This makes it _most_ easy to spot warnings,
because both the command (we've got CC, CXX, etc.) and the filename is (nicely)
aligned and any compiler warning "correctly" disturbs. I suggest you try it on
some projects. :-)
Of course, there is also a switch to turn verbosity back on for whatever use
case comes up. This can be done by passing V=1 to make (or setting it
statically in the Makefile).
Somehow, this patch makes all tests fail due to some non-posixyness.
I doubt $(if ) is not POSIX.
Signed-off-by: Jan Engelhardt <[EMAIL PROTECTED]>
---
automake.in | 72 ++++++++++++++++++++++++++++++++++++++++++++---
lib/Automake/Variable.pm | 17 +++++++++--
lib/am/depend2.am | 32 ++++++++++----------
lib/am/ltlibrary.am | 2 -
lib/am/program.am | 2 -
5 files changed, 101 insertions(+), 24 deletions(-)
Index: automake-1.9.6/automake.in
===================================================================
--- automake-1.9.6.orig/automake.in
+++ automake-1.9.6/automake.in
@@ -50,6 +50,9 @@ struct (# Short name of the language (c,
# Nice name of the language (C, Fortran 77...).
'Name' => "\$",
+ "verbose_compile" => '$',
+ "verbose_link" => '$',
+
# List of configure variables which must be defined.
'config_vars' => '@',
@@ -665,6 +668,8 @@ sub initialize_per_input ()
# C.
register_language ('name' => 'c',
'Name' => 'C',
+ 'verbose_compile' => '$(AM_VERBOSE_CC)',
+ 'verbose_link' => '$(AM_VERBOSE_CCLD)',
'config_vars' => ['CC'],
'ansi' => 1,
'autodep' => '',
@@ -683,6 +688,8 @@ register_language ('name' => 'c',
# C++.
register_language ('name' => 'cxx',
'Name' => 'C++',
+ 'verbose_compile' => '$(AM_VERBOSE_CXX)',
+ 'verbose_link' => '$(AM_VERBOSE_CXXLD)',
'config_vars' => ['CXX'],
'linker' => 'CXXLINK',
'link' => '$(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS)
$(LDFLAGS) -o $@',
@@ -701,6 +708,8 @@ register_language ('name' => 'cxx',
# Objective C.
register_language ('name' => 'objc',
'Name' => 'Objective C',
+ 'verbose_compile' => '$(AM_VERBOSE_OBJC)',
+ 'verbose_link' => '$(AM_VERBOSE_OBJCLD)',
'config_vars' => ['OBJC'],
'linker' => 'OBJCLINK',,
'link' => '$(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS)
$(AM_LDFLAGS) $(LDFLAGS) -o $@',
@@ -728,6 +737,7 @@ register_language ('name' => 'header',
# Yacc (C & C++).
register_language ('name' => 'yacc',
'Name' => 'Yacc',
+ 'verbose_compile' => '$(AM_VERBOSE_YACC)',
'config_vars' => ['YACC'],
'flags' => ['YFLAGS'],
'compile' => '$(YACC) $(YFLAGS) $(AM_YFLAGS)',
@@ -740,6 +750,7 @@ register_language ('name' => 'yacc',
'_target_hook' => \&lang_yacc_target_hook);
register_language ('name' => 'yaccxx',
'Name' => 'Yacc (C++)',
+ 'verbose_compile' => '$(AM_VERBOSE_YACC)',
'config_vars' => ['YACC'],
'rule_file' => 'yacc',
'flags' => ['YFLAGS'],
@@ -754,6 +765,7 @@ register_language ('name' => 'yaccxx',
# Lex (C & C++).
register_language ('name' => 'lex',
'Name' => 'Lex',
+ 'verbose_compile' => '$(AM_VERBOSE_LEX)',
'config_vars' => ['LEX'],
'rule_file' => 'lex',
'flags' => ['LFLAGS'],
@@ -766,6 +778,7 @@ register_language ('name' => 'lex',
'_target_hook' => \&lang_lex_target_hook);
register_language ('name' => 'lexxx',
'Name' => 'Lex (C++)',
+ 'verbose_compile' => '$(AM_VERBOSE_LEX)',
'config_vars' => ['LEX'],
'rule_file' => 'lex',
'flags' => ['LFLAGS'],
@@ -780,6 +793,7 @@ register_language ('name' => 'lexxx',
# Assembler.
register_language ('name' => 'asm',
'Name' => 'Assembler',
+ 'verbose_compile' => '$(AM_VERBOSE_AS)',
'config_vars' => ['CCAS', 'CCASFLAGS'],
'flags' => ['CCASFLAGS'],
@@ -796,6 +810,8 @@ register_language ('name' => 'asm',
# Fortran 77
register_language ('name' => 'f77',
'Name' => 'Fortran 77',
+ 'verbose_compile' => '$(AM_VERBOSE_F77)',
+ 'verbose_link' => '$(AM_VERBOSE_F77LD)',
'linker' => 'F77LINK',
'link' => '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS)
$(LDFLAGS) -o $@',
'flags' => ['FFLAGS'],
@@ -812,6 +828,8 @@ register_language ('name' => 'f77',
# Fortran
register_language ('name' => 'fc',
'Name' => 'Fortran',
+ 'verbose_compile' => '$(AM_VERBOSE_FC)',
+ 'verbose_link' => '$(AM_VERBOSE_FCLD)',
'linker' => 'FCLINK',
'link' => '$(FCLD) $(AM_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS)
$(LDFLAGS) -o $@',
'flags' => ['FCFLAGS'],
@@ -827,6 +845,8 @@ register_language ('name' => 'fc',
# Preprocessed Fortran
register_language ('name' => 'ppfc',
'Name' => 'Preprocessed Fortran',
+ 'verbose_compile' => '$(AM_VERBOSE_FC)',
+ 'verbose_link' => '$(AM_VERBOSE_FCLD)',
'config_vars' => ['FC'],
'linker' => 'FCLINK',
'link' => '$(FCLD) $(AM_FCFLAGS) $(FCFLAGS) $(AM_LDFLAGS)
$(LDFLAGS) -o $@',
@@ -858,6 +878,8 @@ register_language ('name' => 'ppfc',
# available).
register_language ('name' => 'ppf77',
'Name' => 'Preprocessed Fortran 77',
+ 'verbose_compile' => '$(AM_VERBOSE_F77)',
+ 'verbose_link' => '$(AM_VERBOSE_F77LD)',
'config_vars' => ['F77'],
'linker' => 'F77LINK',
'link' => '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS)
$(LDFLAGS) -o $@',
@@ -875,6 +897,8 @@ register_language ('name' => 'ppf77',
# Ratfor.
register_language ('name' => 'ratfor',
'Name' => 'Ratfor',
+ 'verbose_compile' => '$(AM_VERBOSE_F77)',
+ 'verbose_link' => '$(AM_VERBOSE_F77LD)',
'config_vars' => ['F77'],
'linker' => 'F77LINK',
'link' => '$(F77LD) $(AM_FFLAGS) $(FFLAGS) $(AM_LDFLAGS)
$(LDFLAGS) -o $@',
@@ -893,6 +917,8 @@ register_language ('name' => 'ratfor',
# Java via gcj.
register_language ('name' => 'java',
'Name' => 'Java',
+ 'verbose_compile' => '$(AM_VERBOSE_GCJ)',
+ 'verbose_link' => '$(AM_VERBOSE_GCJLD)',
'config_vars' => ['GCJ'],
'linker' => 'GCJLINK',
'link' => '$(GCJLD) $(AM_GCJFLAGS) $(GCJFLAGS) $(AM_LDFLAGS)
$(LDFLAGS) -o $@',
@@ -1181,6 +1207,7 @@ sub handle_languages
OBJOBJ => '$@',
LTOBJ => '$@',
+ VERBOSE => $lang->verbose_compile,
COMPILE => '$(' . $lang->compiler . ')',
LTCOMPILE => '$(LT' . $lang->compiler . ')',
-o => $output_flag,
@@ -1221,7 +1248,7 @@ sub handle_languages
}
my $obj_ltcompile =
- "\$(LIBTOOL) $libtool_tag--mode=compile $obj_compile";
+ "\$(LIBTOOL) \$(AM_LIBTOOL_SILENT) $libtool_tag--mode=compile
$obj_compile";
# We _need_ `-o' for per object rules.
my $output_flag = $lang->output_flag || '-o';
@@ -1313,6 +1340,7 @@ sub handle_languages
OBJOBJ => "$obj_.obj",
LTOBJ => "$obj_.lo",
+ VERBOSE => $lang->verbose_compile,
COMPILE => $obj_compile,
LTCOMPILE => $obj_ltcompile,
-o => $output_flag,
@@ -1339,6 +1367,7 @@ sub handle_languages
OBJOBJ => "$obj.obj",
LTOBJ => "$obj.lo",
+ VERBOSE => $lang->verbose_compile,
COMPILE => $obj_compile,
LTCOMPILE => $obj_ltcompile,
-o => $output_flag,
@@ -2234,6 +2263,17 @@ sub handle_libtool
LTRMS => join ("\n", @libtool_rms));
}
+sub find_link_verbose($)
+{
+ foreach my $lang_name (keys %languages)
+ {
+ if ($languages{$lang_name}->linker eq $_[0])
+ {
+ return $languages{$lang_name}->verbose_link;
+ }
+ }
+}
+
# handle_programs ()
# ------------------
# Handle C programs.
@@ -2313,6 +2353,7 @@ sub handle_programs
PROGRAM => $one_file,
XPROGRAM => $xname,
XLINK => $xlink,
+ VERBOSE => &find_link_verbose($xlink),
DIRSTAMP => $dirstamp,
EXEEXT => '$(EXEEXT)');
@@ -2645,6 +2686,7 @@ sub handle_ltlibraries
XLTLIBRARY => $xlib,
RPATH => $rpath,
XLINK => $xlink,
+ VERBOSE => &find_link_verbose($xlink),
DIRSTAMP => $dirstamp);
if ($seen_libobjs)
{
@@ -5622,7 +5664,6 @@ sub define_pretty_variable ($$$@)
}
}
-
# define_variable ($VAR, $VALUE, $WHERE)
# --------------------------------------
# Define a new user variable VAR to VALUE, but only if not already defined.
@@ -5685,7 +5726,7 @@ sub define_compiler_variable ($)
if $lang->libtool_tag && exists $libtool_tags{$lang->libtool_tag};
&define_variable ($var, $value, INTERNAL);
&define_variable ("LT$var",
- "\$(LIBTOOL) $libtool_tag--mode=compile $value",
+ "\$(LIBTOOL) \$(AM_LIBTOOL_SILENT)
$libtool_tag--mode=compile $value",
INTERNAL)
if var ('LIBTOOL');
}
@@ -5707,7 +5748,7 @@ sub define_linker_variable ($)
# CCLINK = $(CCLD) blah blah...
&define_variable ($lang->linker,
((var ('LIBTOOL') ?
- "\$(LIBTOOL) $libtool_tag--mode=link " : '')
+ "\$(LIBTOOL) \$(AM_LIBTOOL_SILENT)
$libtool_tag--mode=link " : '')
. $lang->link),
INTERNAL);
}
@@ -7170,6 +7211,29 @@ sub generate_makefile ($$)
handle_programs;
handle_scripts;
+ &define_variable("AM_LIBTOOL_SILENT", '$(if $(V),,--silent)', INTERNAL);
+
+ &define_variable("AM_VERBOSE_CC", '$(if $(V),,@echo " CC " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_CCLD", '$(if $(V),,@echo " CCLD " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_CXX", '$(if $(V),,@echo " CXX " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_CXXLD", '$(if $(V),,@echo " CXXLD " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_OBJC", '$(if $(V),,@echo " OBJC " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_OBJCLD", '$(if $(V),,@echo " OBJCLD " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_YACC", '$(if $(V),,@echo " YACC " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_LEX", '$(if $(V),,@echo " LEX " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_AS", '$(if $(V),,@echo " AS " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_F77", '$(if $(V),,@echo " F77 " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_F77LD", '$(if $(V),,@echo " F77LD " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_FC", '$(if $(V),,@echo " FC " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_FCLD", '$(if $(V),,@echo " FCLD " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_GCJ", '$(if $(V),,@echo " GCJ " $@;)',
INTERNAL);
+ &define_variable("AM_VERBOSE_GCJLD", '$(if $(V),,@echo " GCJLD " $@;)',
INTERNAL);
+ #
+ # This is for the user to use in his own rules ("GEN" => "generate")
+ # Use for everything else, e.g. HTML -> TXT, etc.
+ #
+ &define_variable("AM_VERBOSE_GEN", '$(if $(V),,@echo " GEN " $@;)',
INTERNAL);
+
# These must be run after all the sources are scanned. They
# use variables defined by &handle_libraries, &handle_ltlibraries,
# or &handle_programs.
Index: automake-1.9.6/lib/Automake/Variable.pm
===================================================================
--- automake-1.9.6.orig/lib/Automake/Variable.pm
+++ automake-1.9.6/lib/Automake/Variable.pm
@@ -480,6 +480,19 @@ else only that corresponding to C<@cond>
=cut
+sub quote_safe_split($)
+{
+ my $s = shift @_;
+ @_ = ();
+
+ while ($s =~ m{("[^\"\\]*(?:\\.[^\"\\]*)*") ?|([^ ]+) ?| }g)
+ {
+ push(@_, $+);
+ }
+
+ return @_;
+}
+
sub output ($@)
{
my ($self, @conds) = @_;
@@ -519,14 +532,14 @@ sub output ($@)
# add them back, maybe at other places.
$val =~ s/\\$//mg;
my $wrap = makefile_wrap ("$str$name $equals", "$str\t",
- split (' ', $val));
+ "e_safe_split($val));
# If the last line of the definition is made only of
# @substitutions@, append an empty variable to make sure it
# cannot be substituted as a blank line (that would confuse
# HP-UX Make).
$wrap = makefile_wrap ("$str$name $equals", "$str\t",
- split (' ', $val), '$(am__empty)')
+ "e_safe_split($val), '$(am__empty)')
if $wrap =~ /\n([EMAIL PROTECTED]@)+\s*$/;
$res .= $wrap;
Index: automake-1.9.6/lib/am/depend2.am
===================================================================
--- automake-1.9.6.orig/lib/am/depend2.am
+++ automake-1.9.6/lib/am/depend2.am
@@ -65,9 +65,9 @@ if %?NONLIBTOOL%
if %FASTDEP%
## In fast-dep mode, we can always use -o.
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o
%OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
+?!GENERIC? %VERBOSE%if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo"
%-c% -o %OBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
?SUBDIROBJ??GENERIC? depbase=`echo %OBJ% | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`; \
-?GENERIC? if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o
%OBJ% %SOURCE%; \
+?GENERIC? %VERBOSE%if %COMPILE% -MT %OBJ% -MD -MP -MF "%DEPBASE%.Tpo"
%-c% -o %OBJ% %SOURCE%; \
then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Po"; else rm -f "%DEPBASE%.Tpo";
exit 1; fi
else !%FASTDEP%
if %AMDEP%
@@ -75,12 +75,12 @@ if %AMDEP%
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
if %?GENERIC%
-?-o? %COMPILE% %-c% %-o% %OBJ% %SOURCE%
-?!-o? %COMPILE% %-c% %SOURCE%
+?-o? %VERBOSE%%COMPILE% %-c% %-o% %OBJ% %SOURCE%
+?!-o? %VERBOSE%%COMPILE% %-c% %SOURCE%
else !%?GENERIC%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o? %COMPILE% %-c% %-o% %OBJ% `test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE%
-?!-o? %COMPILE% %-c% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%
+?-o? %VERBOSE%%COMPILE% %-c% %-o% %OBJ% `test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE%
+?!-o? %VERBOSE%%COMPILE% %-c% `test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE%
endif !%?GENERIC%
endif !%FASTDEP%
@@ -89,9 +89,9 @@ endif !%FASTDEP%
if %FASTDEP%
## In fast-dep mode, we can always use -o.
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o
%OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else
$(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`; \
+?!GENERIC? %VERBOSE%if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo"
%-c% -o %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%'; else
$(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`; \
?SUBDIROBJ??GENERIC? depbase=`echo %OBJ% | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`; \
-?GENERIC? if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o
%OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`; \
+?GENERIC? %VERBOSE%if %COMPILE% -MT %OBJOBJ% -MD -MP -MF "%DEPBASE%.Tpo"
%-c% -o %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`; \
then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Po"; else rm -f "%DEPBASE%.Tpo";
exit 1; fi
else !%FASTDEP%
if %AMDEP%
@@ -99,12 +99,12 @@ if %AMDEP%
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
if %?GENERIC%
-?-o? %COMPILE% %-c% %-o% %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`
-?!-o? %COMPILE% %-c% `$(CYGPATH_W) '%SOURCE%'`
+?-o? %VERBOSE%%COMPILE% %-c% %-o% %OBJOBJ% `$(CYGPATH_W) '%SOURCE%'`
+?!-o? %VERBOSE%%COMPILE% %-c% `$(CYGPATH_W) '%SOURCE%'`
else !%?GENERIC%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?-o? %COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then $(CYGPATH_W)
'%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
-?!-o? %COMPILE% %-c% `if test -f '%SOURCE%'; then $(CYGPATH_W) '%SOURCE%';
else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?-o? %VERBOSE%%COMPILE% %-c% %-o% %OBJOBJ% `if test -f '%SOURCE%'; then
$(CYGPATH_W) '%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
+?!-o? %VERBOSE%%COMPILE% %-c% `if test -f '%SOURCE%'; then $(CYGPATH_W)
'%SOURCE%'; else $(CYGPATH_W) '$(srcdir)/%SOURCE%'; fi`
endif !%?GENERIC%
endif !%FASTDEP%
endif %?NONLIBTOOL%
@@ -115,9 +115,9 @@ if %?LIBTOOL%
if %FASTDEP%
## In fast-dep mode, we can always use -o.
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o
%LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
+?!GENERIC? %VERBOSE%if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo"
%-c% -o %LTOBJ% `test -f '%SOURCE%' || echo '$(srcdir)/'`%SOURCE%; \
?SUBDIROBJ??GENERIC? depbase=`echo %OBJ% | sed
's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`; \
-?GENERIC? if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo" %-c% -o
%LTOBJ% %SOURCE%; \
+?GENERIC? %VERBOSE%if %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF "%DEPBASE%.Tpo"
%-c% -o %LTOBJ% %SOURCE%; \
then mv -f "%DEPBASE%.Tpo" "%DEPBASE%.Plo"; else rm -f "%DEPBASE%.Tpo";
exit 1; fi
else !%FASTDEP%
if %AMDEP%
@@ -125,8 +125,8 @@ if %AMDEP%
DEPDIR=$(DEPDIR) $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@
endif %AMDEP%
## We can always use `-o' with Libtool.
-?GENERIC? %LTCOMPILE% %-c% -o %LTOBJ% %SOURCE%
+?GENERIC? %VERBOSE%%LTCOMPILE% %-c% -o %LTOBJ% %SOURCE%
## For non-suffix rules, we must emulate a VPATH search on %SOURCE%.
-?!GENERIC? %LTCOMPILE% %-c% -o %LTOBJ% `test -f '%SOURCE%' || echo
'$(srcdir)/'`%SOURCE%
+?!GENERIC? %VERBOSE%%LTCOMPILE% %-c% -o %LTOBJ% `test -f '%SOURCE%' ||
echo '$(srcdir)/'`%SOURCE%
endif !%FASTDEP%
endif %?LIBTOOL%
Index: automake-1.9.6/lib/am/ltlibrary.am
===================================================================
--- automake-1.9.6.orig/lib/am/ltlibrary.am
+++ automake-1.9.6/lib/am/ltlibrary.am
@@ -16,4 +16,4 @@
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
## 02110-1301, USA.
%LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP%
- $(%XLINK%) %RPATH% $(%XLTLIBRARY%_LDFLAGS) $(%XLTLIBRARY%_OBJECTS)
$(%XLTLIBRARY%_LIBADD) $(LIBS)
+ %VERBOSE%$(%XLINK%) %RPATH% $(%XLTLIBRARY%_LDFLAGS)
$(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS)
Index: automake-1.9.6/lib/am/program.am
===================================================================
--- automake-1.9.6.orig/lib/am/program.am
+++ automake-1.9.6/lib/am/program.am
@@ -23,4 +23,4 @@
## Or maybe not... sadly, incremental linkers are rarer than losing
## systems.
@rm -f %PROGRAM%%EXEEXT%
- $(%XLINK%) $(%XPROGRAM%_LDFLAGS) $(%XPROGRAM%_OBJECTS)
$(%XPROGRAM%_LDADD) $(LIBS)
+ %VERBOSE%$(%XLINK%) $(%XPROGRAM%_LDFLAGS) $(%XPROGRAM%_OBJECTS)
$(%XPROGRAM%_LDADD) $(LIBS)
===
