ruby-changes:37245
From: nobu <ko1@a...>
Date: Sun, 18 Jan 2015 22:12:32 +0900 (JST)
Subject: [ruby-changes:37245] nobu:r49326 (trunk): common.mk: make enc/trans
nobu 2015-01-18 22:12:15 +0900 (Sun, 18 Jan 2015) New Revision: 49326 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49326 Log: common.mk: make enc/trans * common.mk: buildtin encoding and transcoder objects need output directories when out-place build. Modified files: trunk/common.mk trunk/enc/depend Index: enc/depend =================================================================== --- enc/depend (revision 49325) +++ enc/depend (revision 49326) @@ -132,7 +132,7 @@ enc/encdb.$(OBJEXT): encdb.h https://github.com/ruby/ruby/blob/trunk/enc/depend#L132 enc/trans/transdb.$(OBJEXT): transdb.h clean: -% %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS)].each do |clean| +% %w[$(ENCSOS) $(LIBENC) $(ENCOBJS) $(ENCCLEANOBJS) $(ENCCLEANLIBS) $(TRANSSOS) $(LIBTRANS) $(TRANSOBJS) $(TRANSCLEANOBJS) $(TRANSCLEANLIBS) enc/trans/.time].each do |clean| $(Q)$(RM) <%=pathrep[clean]%> % end % @ignore_error = $nmake ? '' : ' 2> /dev/null || true' Index: common.mk =================================================================== --- common.mk (revision 49325) +++ common.mk (revision 49326) @@ -28,6 +28,7 @@ EXTCONF = extconf.rb https://github.com/ruby/ruby/blob/trunk/common.mk#L28 LIBRUBY_EXTS = ./.libruby-with-ext.time REVISION_H = ./.revision.time PLATFORM_D = ./$(PLATFORM_DIR)/.time +ENC_TRANS_D = enc/trans/.time RDOCOUT = $(EXTOUT)/rdoc HTMLOUT = $(EXTOUT)/html CAPIOUT = doc/capi @@ -515,6 +516,12 @@ clean-ext distclean-ext realclean-ext:: https://github.com/ruby/ruby/blob/trunk/common.mk#L516 clean-enc distclean-enc realclean-enc: PHONY +clean-enc: clean-enc.d + +clean-enc.d: PHONY + $(Q)$(RM) $(ENC_TRANS_D) + -$(Q) $(RMDIR) enc/trans enc 2> $(NULL) || exit 0 + clean-rdoc distclean-rdoc realclean-rdoc: @echo $(@:-rdoc=ing) rdoc $(Q)$(RMALL) $(RDOCOUT) @@ -641,6 +648,12 @@ $(PLATFORM_D): https://github.com/ruby/ruby/blob/trunk/common.mk#L648 $(Q) $(MAKEDIRS) $(PLATFORM_DIR) @exit > $@ +PHONY $(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D) + +$(ENC_TRANS_D): + $(Q) $(MAKEDIRS) enc/trans + @exit > $@ + ### CCAN_DIR = {$(VPATH)}ccan -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/