diff options
| -rw-r--r-- | Makefile.am.inc | 9 | ||||
| -rw-r--r-- | epan/Makefile.am | 2 | ||||
| -rw-r--r-- | epan/dissectors/Makefile.am | 2 | ||||
| -rw-r--r-- | epan/wslua/Makefile.am | 6 | ||||
| -rw-r--r-- | packaging/macosx/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 | ||||
| -rw-r--r-- | wiretap/Makefile.am | 2 |
7 files changed, 17 insertions, 8 deletions
diff --git a/Makefile.am.inc b/Makefile.am.inc index 5b171aaf96..e1591a498a 100644 --- a/Makefile.am.inc +++ b/Makefile.am.inc @@ -65,6 +65,15 @@ AM_V_SED = $(am__v_SED_@AM_V@) am__v_SED_ = $(am__v_SED_@AM_DEFAULT_V@) am__v_SED_0 = @echo " SED " $@; +# _PYTHON is a reserved automake keyword +AM_V_python = $(am__v_python_@AM_V@) +am__v_python_ = $(am__v_python_@AM_DEFAULT_V@) +am__v_python_0 = @echo " PYTHON " $@; + +AM_V_YACC = $(am__v_YACC_@AM_V@) +am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@) +am__v_YACC_0 = @echo " YACC " $@; + .l.c: $(AM_V_RUNLEX)$(RUNLEX) "$(LEX)" "$(SED)" -o$@ $< diff --git a/epan/Makefile.am b/epan/Makefile.am index 302d650f46..f61866b67c 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -181,7 +181,7 @@ update-sminmpec: $(PERL) $(srcdir)/../tools/make-sminmpec.pl ps.c: print.ps $(top_srcdir)/tools/rdps.py - $(PYTHON) $(top_srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c + $(AM_V_python)$(PYTHON) $(top_srcdir)/tools/rdps.py $(srcdir)/print.ps ps.c if HAVE_PLUGINS diff --git a/epan/dissectors/Makefile.am b/epan/dissectors/Makefile.am index 3191391608..964d0f350d 100644 --- a/epan/dissectors/Makefile.am +++ b/epan/dissectors/Makefile.am @@ -54,7 +54,7 @@ EXTRA_DIST = \ x11-fields packet-ncp2222.c : $(top_srcdir)/tools/ncp2222.py - $(PYTHON) $(top_srcdir)/tools/ncp2222.py -o $@ + $(AM_V_python)$(PYTHON) $(top_srcdir)/tools/ncp2222.py -o $@ # Target to rebuild the X11 dissector header files. # See README.X11 before using this--it requires the xcb and mesa source. diff --git a/epan/wslua/Makefile.am b/epan/wslua/Makefile.am index feb099890f..fca56d132f 100644 --- a/epan/wslua/Makefile.am +++ b/epan/wslua/Makefile.am @@ -118,7 +118,7 @@ taps_used = \ $(top_srcdir)/epan/dissectors/packet-ieee80211.h taps_wslua.c: make-taps.pl $(srcdir)/taps $(taps_used) - $(PERL) $(srcdir)/make-taps.pl $(srcdir)/taps taps_wslua.c taps.txt $(srcdir) + $(AM_V_PERL)$(PERL) $(srcdir)/make-taps.pl $(srcdir)/taps taps_wslua.c taps.txt $(srcdir) taps.txt: taps_wslua.c @@ -127,10 +127,10 @@ wslua.h: declare_wslua.h register_wslua.c: declare_wslua.h declare_wslua.h: make-reg.pl $(wslua_modules) taps_wslua.c - $(PERL) $(srcdir)/make-reg.pl -d $(srcdir) $(wslua_modules) + $(AM_V_PERL)$(PERL) $(srcdir)/make-reg.pl -d $(srcdir) $(wslua_modules) init.lua: template-init.lua make-init-lua.pl $(top_srcdir)/epan/ftypes/ftypes.h $(top_srcdir)/wiretap/wtap.h $(top_srcdir)/epan/proto.h $(top_srcdir)/epan/stat_groups.h - $(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua + $(AM_V_PERL)$(PERL) $(srcdir)/make-init-lua.pl $(top_srcdir) $(srcdir)/template-init.lua > init.lua checkapi: $(PERL) $(top_srcdir)/tools/checkAPIs.pl -g termoutput -build \ diff --git a/packaging/macosx/Makefile.am b/packaging/macosx/Makefile.am index b72ed2bb31..db2ef1cb41 100644 --- a/packaging/macosx/Makefile.am +++ b/packaging/macosx/Makefile.am @@ -92,7 +92,7 @@ EXTRA_DIST = \ COPYING.txt: $(top_srcdir)/COPYING - cp $(top_srcdir)/COPYING $@ + $(AM_V_GEN)cp $(top_srcdir)/COPYING $@ all: COPYING.txt diff --git a/tools/Makefile.am b/tools/Makefile.am index 11e8087507..60e04065a4 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -203,7 +203,7 @@ setuid-root.pl: setuid-root.pl.in Makefile -e 's,@BIN_PREFIX\@,$(bindir),' \ -e 's,@TSHARK_BIN\@,$(tshark_bin)$(EEXT),' \ -e 's,@DUMPCAP_BIN\@,$(dumpcap_bin)$(EEXT),' \ - < $(srcdir)/setuid-root.pl.in > setuid-root.pl + < $(srcdir)/setuid-root.pl.in > setuid-root.pl; \ chmod +x setuid-root.pl CLEANFILES = \ diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 05d60eca60..bd65b2ba37 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -78,7 +78,7 @@ ascend.c: ascend.y echo "Neither bison nor byacc has been found"; \ exit 1; \ fi - $(YACC) -d -p ascend -o ascend.c $(srcdir)/ascend.y + $(AM_V_YACC)$(YACC) -d -p ascend -o ascend.c $(srcdir)/ascend.y # ABI compliance checker can be obtained from # http://ispras.linux-foundation.org/index.php/ABI_compliance_checker |