From 7187abf1205973761e99536713c834f4bfee6f9d Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 1 Feb 2013 22:57:41 +0000 Subject: Add $(AM_V_GEN) in a few more places. svn path=/trunk/; revision=47434 --- Makefile.am | 2 +- Makefile.am.inc | 6 +++--- doc/Makefile.am | 8 ++++---- epan/Makefile.am | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2b073cd5be..6d8611efab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -982,7 +982,7 @@ SUBDIRS = tools wsutil wiretap epan packaging help ui @wireshark_SUBDIRS@ ui/cli endif help/faq.txt: $(srcdir)/help/faq.py - (cd help ; \ + $(AM_V_GEN)(cd help ; \ $(MAKE) faq.txt ;) libtool: $(LIBTOOL_DEPS) diff --git a/Makefile.am.inc b/Makefile.am.inc index 499ceb80c0..df3007318d 100644 --- a/Makefile.am.inc +++ b/Makefile.am.inc @@ -24,12 +24,12 @@ AUTOMAKE_OPTIONS = -Wno-portability .l.c: - $(RUNLEX) "$(LEX)" -o$@ $< + $(AM_V_GEN)$(RUNLEX) "$(LEX)" -o$@ $< .def.sym: - $(AWK) '/^EXPORTS$$/ {next;}; ${def_sym_filter_symbols} /^[^;]/ { print $$1;}' < $< > $@ + $(AM_V_GEN)$(AWK) '/^EXPORTS$$/ {next;}; ${def_sym_filter_symbols} /^[^;]/ { print $$1;}' < $< > $@ # abi-compliance-checker descriptor INCLUDE_DIRS = $(subst -I,NEWLINE,$(filter -I%, $(CFLAGS) -I$(abs_top_srcdir) -I$(abs_srcdir))) abi-descriptor.xml: ../abi-descriptor.template - sed "s|INCLUDE_DIRS|$(INCLUDE_DIRS)|g;s/NEWLINE/\n /g" $< > $@ + $(AM_V_GEN)sed "s|INCLUDE_DIRS|$(INCLUDE_DIRS)|g;s/NEWLINE/\n /g" $< > $@ diff --git a/doc/Makefile.am b/doc/Makefile.am index 00c02508de..2361ffde12 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -90,12 +90,12 @@ pkgdata_DATA = AUTHORS-SHORT $(top_srcdir)/docbook/ws.css wireshark.html \ # Build the short version of the authors file for the about dialog # AUTHORS-SHORT: $(top_srcdir)/AUTHORS $(srcdir)/make-authors-short.pl - $(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < $(top_srcdir)/AUTHORS > AUTHORS-SHORT + $(AM_V_GEN)$(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < $(top_srcdir)/AUTHORS > AUTHORS-SHORT # Put a copy in the top-level directory so Help->About, when run from the # build directory, can find it. ../AUTHORS-SHORT: AUTHORS-SHORT - cp AUTHORS-SHORT .. + $(AM_V_GEN)cp AUTHORS-SHORT .. # # Build the short version of the authors file with formatting codes for the @@ -104,10 +104,10 @@ AUTHORS-SHORT: $(top_srcdir)/AUTHORS $(srcdir)/make-authors-short.pl # down there.) # AUTHORS-SHORT-FORMAT: ../AUTHORS-SHORT $(srcdir)/make-authors-format.pl - $(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT + $(AM_V_GEN)$(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT wireshark.pod: $(srcdir)/wireshark.pod.template AUTHORS-SHORT-FORMAT - cat $(srcdir)/wireshark.pod.template AUTHORS-SHORT-FORMAT > wireshark.pod + $(AM_V_GEN)cat $(srcdir)/wireshark.pod.template AUTHORS-SHORT-FORMAT > wireshark.pod wireshark.1: wireshark.pod ../config.h $(AM_V_GEN)$(POD2MAN) \ diff --git a/epan/Makefile.am b/epan/Makefile.am index d352d6321e..e52271f3e9 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -304,7 +304,7 @@ endif # HAVE_PLUGINS doxygen: if HAVE_DOXYGEN - $(DOXYGEN) doxygen.cfg + $(AM_V_GEN)$(DOXYGEN) doxygen.cfg endif # HAVE_DOXYGEN # ABI compliance checker can be obtained from @@ -339,4 +339,4 @@ dumpabi: all abi-descriptor.xml cd .libs && ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz checkapi: - $(PERL) ../tools/checkAPIs.pl -g termoutput -build $(LIBWIRESHARK_SRC) + $(AM_V_GEN)$(PERL) ../tools/checkAPIs.pl -g termoutput -build $(LIBWIRESHARK_SRC) -- cgit v1.2.1