diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | bin/automake.in | 8 | ||||
| -rw-r--r-- | doc/automake.texi | 3 | ||||
| -rw-r--r-- | t/link_override.sh | 7 |
5 files changed, 20 insertions, 3 deletions
@@ -18,7 +18,9 @@ New in ?.?.?: - CTAGS, ETAGS, SCOPE variables can be set via configure. - - new option "no-dist-built-sources" skips generating $(BUILT_SOURCES) + - Silent make output for custom link commands. + + - New option "no-dist-built-sources" skips generating $(BUILT_SOURCES) before building the tarball as part of "make dist", that is, omits the dependency of $(distdir): $(BUILT_SOURCES). @@ -300,6 +300,7 @@ Nelson H. F. Beebe beebe@math.utah.edu Nicholas Wourms nwourms@netscape.net Nick Bowler nbowler@elliptictech.com Nick Brown brownn@brocade.com +Nick Gasson nick@nickg.me.uk Nicola Fontana ntd@entidi.it Nicolas Joly njoly@pasteur.fr Nicolas Thiery nthiery@Icare.mines.edu diff --git a/bin/automake.in b/bin/automake.in index f6ebe30ea..f04f5d5f5 100644 --- a/bin/automake.in +++ b/bin/automake.in @@ -6360,8 +6360,12 @@ sub define_per_target_linker_variable my ($linker, $target) = @_; # If the user wrote a custom link command, we don't define ours. - return "${target}_LINK" - if set_seen "${target}_LINK"; + my $custom_link = "${target}_LINK"; + if (set_seen ($custom_link)) + { + my $verbose = $custom_link if var (verbose_var ($custom_link)); + return ($custom_link, $verbose); + } my $xlink = $linker ? $linker : 'LINK'; diff --git a/doc/automake.texi b/doc/automake.texi index dd932ddd7..0a0da6168 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -5903,6 +5903,9 @@ and used by Automake due to the use of per-target link flags such as @code{_CFLAGS}, @code{_LDFLAGS} or @code{_LIBTOOLFLAGS}, in cases where they apply. +If the variable @code{AM_V_*_LINK} exists, it is used to output a +status line in silent mode; otherwise, @code{AM_V_GEN} is used. + @item maude_CCASFLAGS @itemx maude_CFLAGS @itemx maude_CPPFLAGS diff --git a/t/link_override.sh b/t/link_override.sh index 1ac45fc5d..81787af91 100644 --- a/t/link_override.sh +++ b/t/link_override.sh @@ -27,6 +27,8 @@ bin_PROGRAMS = foo bar baz boo foo_LINK = $(LINK) bar_LINK = $(LINK) bar_LDFLAGS = $(AM_LDFLAGS) +baz_LINK = $(LINK) +AM_V_baz_LINK = xyz END $ACLOCAL @@ -41,4 +43,9 @@ grep '.\$(LINK).*foo' Makefile.in && exit 1 grep '^ *bar_LINK *=.*bar_LDFLAGS' Makefile.in && exit 1 grep '.\$(bar_LINK).*bar' Makefile.in +# Silent make rules should use AM_V_GEN unless overriden. +grep '.\$(AM_V_GEN)\$(foo_LINK)' Makefile.in +grep '.\$(AM_V_baz_LINK)\$(baz_LINK)' Makefile.in +grep '.\$(AM_V_GEN)\$(baz_LINK)' Makefile.in && exit 1 + exit 0 |