Skip to content

Commit

Permalink
common.mk: make enc/trans
Browse files Browse the repository at this point in the history
* common.mk: buildtin encoding and transcoder objects need output
  directories when out-place build.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Jan 18, 2015
1 parent 2d47bf6 commit 4c3d694
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
13 changes: 13 additions & 0 deletions common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ EXTCONF = extconf.rb
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
Expand Down Expand Up @@ -515,6 +516,12 @@ clean-ext distclean-ext realclean-ext::

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)
Expand Down Expand Up @@ -641,6 +648,12 @@ $(PLATFORM_D):
$(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

Expand Down
2 changes: 1 addition & 1 deletion enc/depend
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ enc/encdb.$(OBJEXT): encdb.h
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'
Expand Down

0 comments on commit 4c3d694

Please sign in to comment.