From f2f7a7740a0c4542ae8dc8db393f184a7a6b2174 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 11 Nov 2010 12:46:23 +0000
Subject: * common.mk: hide long command lines by default.  verbose-mode is  
 turned on by V=1 as before.  
 http://jarp.does.notwork.org/diary/200605b.html#200605121

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29748 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 enc/Makefile.in |  6 ++++++
 enc/depend      | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'enc')

diff --git a/enc/Makefile.in b/enc/Makefile.in
index 9b4c2aeb56..40c639041a 100644
--- a/enc/Makefile.in
+++ b/enc/Makefile.in
@@ -1,3 +1,9 @@
+V = 0
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+ECHO1 = $(V:1=@:)
+ECHO = $(ECHO1:0=@echo)
+
 encsrcdir = @srcdir@
 topdir = .
 prefix = @prefix@
diff --git a/enc/depend b/enc/depend
index ef889157d7..5d9d72eec6 100644
--- a/enc/depend
+++ b/enc/depend
@@ -80,6 +80,8 @@ trans: $(TRANSSOS)
 srcs: $(TRANSCSRCS)
 
 <%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c:
+	$(ECHO) generating table from $@
+	$(Q) \
 	$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<"
 
 % unless encs.empty? or trans.empty?
@@ -104,23 +106,36 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.
 % dependencies.each do |e|
 %   obj = "enc/#{e}.$(OBJEXT)"
 %   df = ("enc/#{e}.def" if deffile)
-$(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%>
+%   target = e.dup
+%   if target.sub!(/\Atrans\//, '$(TRANSSODIR)/')
+%     mesg = "transcoder"
+%   else
+%     target = "$(ENCSODIR)/#{e}"
+%     mesg = "encoding"
+%   end
+<%=target%>.$(DLEXT): <%=obj%>
+	$(ECHO) linking <%=mesg%> $(@F)
 %   cmd = link_so.sub(/\$\(OBJS\)/) {obj}
 %   base = File.basename(e)
 %   cmd.sub!(/(?=\$\(DLDFLAGS\))/) {dldflags.sub(/\$\(TARGET\)/) {base} + " "} if dldflags
 %   if df
+	$(Q) \
 	echo> <%=df%> EXPORTS
+	$(Q) \
 	echo>> <%=df%> <%=EXPORT_PREFIX%>Init_<%=base%>
 %     cmd.sub!(/\$\(DEFFILE\)/) {df}
 %     cmd.gsub!(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}
 %   end
 	@$(MAKEDIRS) "$(@D)"
+	$(Q) \
 	<%=cmd%>
 
 % end
 % dependencies.each do |e|
 <%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%>
 	-@$(MAKEDIRS) "$(@D)"
+	$(ECHO) compiling <%= "#{e}.c"%>
+	$(Q) \
 	<%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%>
 
 % end
-- 
cgit v1.2.3