From 05ec839244c807c1b6f6f701abd01f5eac41a37e Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 31 Jul 2011 14:17:37 +0000 Subject: [PATCH] Forward-ports r32776 from branches/ruby_1_9_3 to trunk. -- * common.mk (node_name.inc): Use $(Q) for consistency. * Makefile.in (INSNS): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ Makefile.in | 3 ++- common.mk | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 922ba8451c95b9..8288383ff18d78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jul 31 21:09:04 2011 Yuki Sonoda (Yugui) + + * common.mk (node_name.inc): Use $(Q) for consistency. + + * Makefile.in (INSNS): ditto. + Sun Jul 31 21:19:51 2011 Yuki Sonoda (Yugui) * lib/mkmf.rb (configuration:ECHO1): Same as the recent fix in diff --git a/Makefile.in b/Makefile.in index 912547860e4352..bcdaf5f7a954f4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -381,4 +381,5 @@ INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ $(INSNS): $(srcdir)/insns.def vm_opts.h \ $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def \ $(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb - $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ + $(ECHO) generating $@ + $(Q) $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ diff --git a/common.mk b/common.mk index 67cada076c74fc..ea244cca835b03 100644 --- a/common.mk +++ b/common.mk @@ -808,7 +808,8 @@ id.h: parse.h $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl $(srcdir)/template/id.h.tmpl --vpath=$(VPATH) parse.h node_name.inc: {$(VPATH)}node.h - $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $? > $@ + $(ECHO) generating $@ + $(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $? > $@ encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl $(ECHO) generating $@