Clean up the incidentals to encoding/transcoding objects [ci skip]

nobu · nobu · commit fbec42fb390b · 2024-03-07T14:16:22.000+09:00
diff --git a/enc/Makefile.in b/enc/Makefile.in
@@ -72,6 +72,7 @@ WORKDIRS = @WORKDIRS@
 
 NULLCMD = @NULLCMD@
 RM = @RM@
+RMALL = @RMALL@
 RMDIR = @RMDIR@
 RMDIRS = @RMDIRS@
 MAKEDIRS = @MAKEDIRS@
diff --git a/enc/depend b/enc/depend
@@ -35,6 +35,7 @@ ENCSOS =<%ENCS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \
         <%}%> #
 ENCCLEANLIBS = <%=cleanlibs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
+       .gsub(/\A\$\(TARGET_SO\)(.*)/) {"$(ENCSOS:=#{$1})"}
 }.join(" ")%>
 ENCCLEANOBJS = <%=cleanobjs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(ENCOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
@@ -51,6 +52,7 @@ TRANSSOS =<%TRANS.map {|e|%> $(ENCSODIR)/<%=e%>.$(DLEXT) \
           <%}%> #
 TRANSCLEANLIBS = <%=cleanlibs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
+       .gsub(/\A\$\(TARGET_SO\)(.*)/) {"$(TRANSSOS:=#{$1})"}
 }.join(" ")%>
 TRANSCLEANOBJS = <%=cleanobjs.map {|clean|
   clean.gsub(/\$\*(\.\w+)?/) {"$(TRANSOBJS#{$1 ? ":.#{CONFIG["OBJEXT"]}=#{$1}" : ""})"}
@@ -151,7 +153,7 @@ enc/trans/transdb.$(OBJEXT): transdb.h
 
 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
 % unless inplace
 	$(Q)$(RM) enc/unicode/*/casefold.h enc/unicode/*/name2ctype.h
