diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-11 12:46:23 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-11 12:46:23 +0000 |
| commit | f2f7a7740a0c4542ae8dc8db393f184a7a6b2174 (patch) | |
| tree | a130a4b5ad7654da59debfe6e1f7f20b88d55972 /enc/depend | |
| parent | 7ef29a9f5e6b0ac8e194e6bb81353c992aac5669 (diff) | |
| download | ruby-f2f7a7740a0c4542ae8dc8db393f184a7a6b2174.tar.gz | |
* 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
Diffstat (limited to 'enc/depend')
| -rw-r--r-- | enc/depend | 17 |
1 files changed, 16 insertions, 1 deletions
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 |