diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-29 11:27:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-29 11:27:36 +0000 |
| commit | 0dfd81cb2397600ce92bd690f4c4f9152518b952 (patch) | |
| tree | 8978ce56d1617ec611fe262ef0e5e6ee996cd97c /enc | |
| parent | 055e4558bdd9f49720789dba7363fe785444f453 (diff) | |
* win32/Makefile.sub (clean-enc): pass V to inferior make.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
| -rw-r--r-- | enc/Makefile.in | 4 | ||||
| -rw-r--r-- | enc/depend | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/enc/Makefile.in b/enc/Makefile.in index 0894b26fb2..3dace9fde6 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -63,10 +63,10 @@ MAKEDIRS = @MAKEDIRS@ all: make-workdir make-workdir: - $(Q) $(MAKEDIRS) $(WORKDIRS) + $(Q)$(MAKEDIRS) $(WORKDIRS) clean: distclean: clean - @$(RM) enc.mk + $(Q)$(RM) enc.mk realclean: distclean clean-srcs diff --git a/enc/depend b/enc/depend index e331d5b595..7285649016 100644 --- a/enc/depend +++ b/enc/depend @@ -83,7 +83,7 @@ srcs: $(TRANSCSRCS) <%=transvpath_prefix%>.trans<%=transvpath_prefix%>.c: $(ECHO) generating table from $@ - $(Q) $(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<" + $(Q)$(MINIRUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo "$@" "$<" % unless encs.empty? or trans.empty? @@ -120,20 +120,20 @@ $(TRANSOBJS): ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma. % 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%> + $(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 - $(Q) $(MAKEDIRS) "$(@D)" - $(Q) <%=cmd%> + $(Q)$(MAKEDIRS) "$(@D)" + $(Q)<%=cmd%> % end % dependencies.each do |e| <%="enc/#{e}.$(OBJEXT)"%>: <%="$(encsrcdir)/#{e}.c"%> - -$(Q) $(MAKEDIRS) "$(@D)" + -$(Q)$(MAKEDIRS) "$(@D)" $(ECHO) compiling <%= "#{e}.c"%> - $(Q) <%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%> + $(Q)<%=COMPILE_C.gsub(/\$(\()?<(\:[^)]+)?(\))?/){"$(encsrcdir)/#{e}.c"}%> % end @@ -142,16 +142,16 @@ enc/trans/transdb.$(OBJEXT): transdb.h clean: % %w[$(ENCSOS) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean| - @$(RM) <%=pathrep[clean]%> + $(Q)$(RM) <%=pathrep[clean]%> % end % @ignore_error = $nmake ? '' : ' 2> /dev/null || true' % workdirs.reverse_each do|dir| - @-$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%> + -$(Q)$(RMDIR) <%=pathrep[dir]%><%=@ignore_error%> % end clean-srcs: - @$(RM) <%=pathrep['$(TRANSCSRCS)']%> - @-$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%> - @$(RM) enc/unicode/name2ctype.h - @-$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%> - @-$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%> + $(Q)$(RM) <%=pathrep['$(TRANSCSRCS)']%> + -$(Q)$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%> + $(Q)$(RM) enc/unicode/name2ctype.h + -$(Q)$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%> + -$(Q)$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%> |