summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-22 12:30:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-22 12:30:31 +0000
commit655b18e91490f0cd7e2055e8ab0075c6b2278322 (patch)
treef149c3ac499d80138f417603496a159671322948
parent184c7e660d10055b599d596f48fb5e600a04bc35 (diff)
common.mk: source dependency for nmake
* common.mk (ext/rbconfig/sizeof/sizes.c): separate the dependency with VPATH and the command, get rid of weird VPATH behavior of nmake. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--common.mk4
-rw-r--r--ext/rbconfig/sizeof/depend2
2 files changed, 4 insertions, 2 deletions
diff --git a/common.mk b/common.mk
index 6d0d330..1d8a362 100644
--- a/common.mk
+++ b/common.mk
@@ -886,8 +886,10 @@ $(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
-$(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
+{$(VPATH)}ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
+
+ext/rbconfig/sizeof/sizes.c:
$(ECHO) generating $@
$(Q) $(CHDIR) $(@D) && \
sed '/AUTOGENERATED/q;s#{.*}##' depend | \
diff --git a/ext/rbconfig/sizeof/depend b/ext/rbconfig/sizeof/depend
index 4243785..f081b17 100644
--- a/ext/rbconfig/sizeof/depend
+++ b/ext/rbconfig/sizeof/depend
@@ -1,4 +1,4 @@
-{$(VPATH)}sizes.c: $(top_srcdir)/tool/generic_erb.rb \
+sizes.c: $(top_srcdir)/tool/generic_erb.rb \
$(top_srcdir)/template/sizes.c.tmpl \
$(top_srcdir)/configure.in \
$(top_srcdir)/ext/rbconfig/sizeof/extconf.rb