mirror of
https://github.com/ruby/ruby.git
synced 2025-08-15 13:39:04 +02:00
Clean up the incidentals to encoding/transcoding objects [ci skip]
This commit is contained in:
parent
d3279a0c11
commit
fbec42fb39
2 changed files with 4 additions and 1 deletions
|
@ -72,6 +72,7 @@ WORKDIRS = @WORKDIRS@
|
||||||
|
|
||||||
NULLCMD = @NULLCMD@
|
NULLCMD = @NULLCMD@
|
||||||
RM = @RM@
|
RM = @RM@
|
||||||
|
RMALL = @RMALL@
|
||||||
RMDIR = @RMDIR@
|
RMDIR = @RMDIR@
|
||||||
RMDIRS = @RMDIRS@
|
RMDIRS = @RMDIRS@
|
||||||
MAKEDIRS = @MAKEDIRS@
|
MAKEDIRS = @MAKEDIRS@
|
||||||
|
|
|
@ -35,6 +35,7 @@ ENCSOS =<%ENCS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \
|
||||||
<%}%> #
|
<%}%> #
|
||||||
ENCCLEANLIBS = <%=cleanlibs.map {|clean|
|
ENCCLEANLIBS = <%=cleanlibs.map {|clean|
|
||||||
clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
|
clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
|
||||||
|
.gsub(/\A\$\(TARGET_SO\)(.*)/) {"$(ENCSOS:=#{$1})"}
|
||||||
}.join(" ")%>
|
}.join(" ")%>
|
||||||
ENCCLEANOBJS = <%=cleanobjs.map {|clean|
|
ENCCLEANOBJS = <%=cleanobjs.map {|clean|
|
||||||
clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
|
clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
|
||||||
|
@ -51,6 +52,7 @@ TRANSSOS =<%TRANS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \
|
||||||
<%}%> #
|
<%}%> #
|
||||||
TRANSCLEANLIBS = <%=cleanlibs.map {|clean|
|
TRANSCLEANLIBS = <%=cleanlibs.map {|clean|
|
||||||
clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
|
clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
|
||||||
|
.gsub(/\A\$\(TARGET_SO\)(.*)/) {"$(TRANSSOS:=#{$1})"}
|
||||||
}.join(" ")%>
|
}.join(" ")%>
|
||||||
TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
|
TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
|
||||||
clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
|
clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
|
||||||
|
@ -151,7 +153,7 @@ enc/trans/transdb.$(OBJEXT): transdb.h
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
% %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS) $(ENC_TRANS_D) $(ENC_TRANS_SO_D)].each do |clean|
|
% %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS) $(ENC_TRANS_D) $(ENC_TRANS_SO_D)].each do |clean|
|
||||||
$(Q)$(RM) <%=pathrep[clean]%>
|
$(Q)$(RMALL) <%=pathrep[clean]%>
|
||||||
% end
|
% end
|
||||||
% unless inplace
|
% unless inplace
|
||||||
$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
|
$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue