More silent build support.

svn path=/trunk/; revision=47472

diff --git a/Makefile.am.inc b/Makefile.am.inc
index df3007318d8ec8ba86cefc96c2f30558b2241d86..5e3af0261f1d53bb08270abff3d78582ee11ca7d 100644 (file)
--- a/Makefile.am.inc
+++ b/Makefile.am.inc
@@ -23,13 +23,33 @@
 
 AUTOMAKE_OPTIONS = -Wno-portability
 
+AM_V_AWK = $(am__v_AWK_$(V))
+am__v_AWK_ = $(am__v_AWK_$(AM_DEFAULT_VERBOSITY))
+am__v_AWK_0 = @echo "  AWK     " $@;
+am__v_AWK_1 = 
+
+AM_V_LEMON = $(am__v_LEMON_$(V))
+am__v_LEMON_ = $(am__v_LEMON_$(AM_DEFAULT_VERBOSITY))
+am__v_LEMON_0 = @echo "  LEMON   " $@;
+am__v_LEMON_1 = 
+
+AM_V_RUNLEX = $(am__v_RUNLEX_$(V))
+am__v_RUNLEX_ = $(am__v_RUNLEX_$(AM_DEFAULT_VERBOSITY))
+am__v_RUNLEX_0 = @echo "  RUNLEX  " $@;
+am__v_RUNLEX_1 = 
+
+AM_V_SED = $(am__v_SED_$(V))
+am__v_SED_ = $(am__v_SED_$(AM_DEFAULT_VERBOSITY))
+am__v_SED_0 = @echo "  SED     " $@;
+am__v_SED_1 = 
+
 .l.c:
-       $(AM_V_GEN)$(RUNLEX) "$(LEX)" -o$@ $<
+       $(AM_V_RUNLEX)$(RUNLEX) "$(LEX)" -o$@ $<
 
 .def.sym:
-       $(AM_V_GEN)$(AWK) '/^EXPORTS$$/ {next;}; ${def_sym_filter_symbols} /^[^;]/ { print $$1;}' < $< > $@
+       $(AM_V_AWK)$(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
-       $(AM_V_GEN)sed "s|INCLUDE_DIRS|$(INCLUDE_DIRS)|g;s/NEWLINE/\n    /g" $< > $@
+       $(AM_V_SED)sed "s|INCLUDE_DIRS|$(INCLUDE_DIRS)|g;s/NEWLINE/\n    /g" $< > $@

diff --git a/epan/Makefile.am b/epan/Makefile.am
index 22c189e4eab1c1b2ae0c7b5f4bf8d6aeaf586e45..902998ffa7cb3e4a69d4de6ce53d142f1474521c 100644 (file)
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -179,11 +179,6 @@ uat_load_lex.h: uat_load.c
 
 LEMON=../tools/lemon
 
-AM_V_LEMON = $(am__v_LEMON_$(V))
-am__v_LEMON_ = $(am__v_LEMON_$(AM_DEFAULT_VERBOSITY))
-am__v_LEMON_0 = @echo "  LEMON   " $@;
-am__v_LEMON_1 = 
-
 dtd_grammar.c dtd_grammar.h: $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/dtd_grammar.lemon
        $(AM_V_LEMON)$(LEMON)/lemon$(EXEEXT) t=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/dtd_grammar.lemon
 

diff --git a/epan/dfilter/Makefile.am b/epan/dfilter/Makefile.am
index 8e3e12f577e2a272c5d4ed01bf4711d8984ea505..a67acaf11a7d8687f3a8674f50aa47c2046bed20 100644 (file)
--- a/epan/dfilter/Makefile.am
+++ b/epan/dfilter/Makefile.am
@@ -1,25 +1,17 @@
-# Makefile.am
-#
-# $Id$
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 2001 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
+# Makefile.am # # $Id$ #
+# Wireshark - Network traffic analyzer # By Gerald Combs
+<gerald@wireshark.org> # Copyright 2001 Gerald Combs # # This program is
+free software; you can redistribute it and/or # modify it under the
+terms of the GNU General Public License # as published by the Free
+Software Foundation; either version 2 # of the License, or (at your
+option) any later version.  # # This program is distributed in the hope
+that it will be useful, # but WITHOUT ANY WARRANTY; without even the
+implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the # GNU General Public License for more details.  # #
+You should have received a copy of the GNU General Public License #
+along with this program; if not, write to the Free Software #
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.  #
 
 include ../../Makefile.am.inc
 
@@ -76,11 +68,6 @@ scanner.lo: grammar.h
 
 LEMON=../../tools/lemon
 
-AM_V_LEMON = $(am__v_LEMON_$(V))
-am__v_LEMON_ = $(am__v_LEMON_$(AM_DEFAULT_VERBOSITY))
-am__v_LEMON_0 = @echo "  LEMON   " $@;
-am__v_LEMON_1 = 
-
 grammar.c grammar.h : $(LEMON)/lemon$(EXEEXT) $(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon
        $(AM_V_LEMON)$(LEMON)/lemon$(EXEEXT) t=$(srcdir)/$(LEMON)/lempar.c $(srcdir)/grammar.lemon || \
                (rm -f grammar.c grammar.h ; false)

diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am
index 135b77a552bfac434cb02aa75d7197e7ec1ee23e..cfca2e5ed1f5494868053aeef03ac27e8a92a934 100644 (file)
--- a/plugins/mate/Makefile.am
+++ b/plugins/mate/Makefile.am
@@ -138,11 +138,6 @@ RUNLEX = $(top_srcdir)/tools/runlex.sh
 
 LEMON = $(top_builddir)/tools/lemon
 
-AM_V_LEMON = $(am__v_LEMON_$(V))
-am__v_LEMON_ = $(am__v_LEMON_$(AM_DEFAULT_VERBOSITY))
-am__v_LEMON_0 = @echo "  LEMON   " $@;
-am__v_LEMON_1 = 
-
 mate_parser_lex.h : mate_parser.c
 
 mate_parser.lo : mate_grammar.h