diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-15 21:26:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-15 21:26:02 +0000 |
| commit | 5daeefc4f2bb653a8cb46425daff4dffcaef7c72 (patch) | |
| tree | 58f34b9c413d9fe60741b7eec03da04e1b72ea5b | |
| parent | 096cabd355689f8e925d29522af85025d9b544ed (diff) | |
| download | ruby-5daeefc4f2bb653a8cb46425daff4dffcaef7c72.tar.gz | |
common.mk: directory timestamps
* common.mk, enc/Makefile.in: moved timestamp files for
directories under the specific directory, to get rid of match
with files under the source directory.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55696 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | common.mk | 9 | ||||
| -rw-r--r-- | enc/Makefile.in | 5 |
3 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Sat Jul 16 06:26:00 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk, enc/Makefile.in: moved timestamp files for + directories under the specific directory, to get rid of match + with files under the source directory. + Fri Jul 15 22:05:13 2016 Naohisa Goto <ngotogenome@gmail.com> * string.c (str_buf_cat): Fix potential interger overflow of capa. @@ -35,11 +35,12 @@ DOCLIE_GIT_REF = v1.1.5 STATIC_RUBY = static-ruby +TIMESTAMPDIR = $(EXTOUT)/.timestamp EXTCONF = extconf.rb LIBRUBY_EXTS = ./.libruby-with-ext.time REVISION_H = ./.revision.time -PLATFORM_D = ./$(PLATFORM_DIR)/.time -ENC_TRANS_D = ./enc/trans/.time +PLATFORM_D = $(TIMESTAMPDIR)/.$(PLATFORM_DIR).time +ENC_TRANS_D = $(TIMESTAMPDIR)/.enc-trans.time RDOCOUT = $(EXTOUT)/rdoc HTMLOUT = $(EXTOUT)/html CAPIOUT = doc/capi @@ -693,13 +694,13 @@ PHONY: $(Q)$(RM) y.tab.c y.tab.h $(PLATFORM_D): - $(Q) $(MAKEDIRS) $(PLATFORM_DIR) + $(Q) $(MAKEDIRS) $(PLATFORM_DIR) $(@D) @exit > $@ $(BUILTIN_ENCOBJS) $(BUILTIN_TRANSOBJS): $(ENC_TRANS_D) $(ENC_TRANS_D): - $(Q) $(MAKEDIRS) enc/trans + $(Q) $(MAKEDIRS) enc/trans $(@D) @exit > $@ ### diff --git a/enc/Makefile.in b/enc/Makefile.in index 73b1e70941..8385236494 100644 --- a/enc/Makefile.in +++ b/enc/Makefile.in @@ -20,8 +20,9 @@ TRANSSODIR = $(ENCSODIR)/trans DLEXT = @DLEXT@ OBJEXT = @OBJEXT@ LIBEXT = @LIBEXT@ -ENC_TRANS_D = ./enc/trans/.time -ENC_TRANS_SO_D = ./enc/trans/.so.time +TIMESTAMPDIR = $(EXTOUT)/.timestamp +ENC_TRANS_D = $(TIMESTAMPDIR)/.enc-trans.time +ENC_TRANS_SO_D = $(TIMESTAMPDIR)/.enc-trans.so.time BUILTIN_ENCS = enc/ascii.c enc/us_ascii.c\ enc/unicode.c enc/utf_8.c |