[前][次][番号順一覧][スレッド一覧]

ruby-changes:41544

From: nobu <ko1@a...>
Date: Fri, 22 Jan 2016 21:29:47 +0900 (JST)
Subject: [ruby-changes:41544] nobu:r53618 (trunk): common.mk: source dependency for nmake

nobu	2016-01-22 21:30:31 +0900 (Fri, 22 Jan 2016)

  New Revision: 53618

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=53618

  Log:
    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.

  Modified files:
    trunk/common.mk
    trunk/ext/rbconfig/sizeof/depend
Index: ext/rbconfig/sizeof/depend
===================================================================
--- ext/rbconfig/sizeof/depend	(revision 53617)
+++ ext/rbconfig/sizeof/depend	(revision 53618)
@@ -1,4 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ext/rbconfig/sizeof/depend#L1
-{$(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
Index: common.mk
===================================================================
--- common.mk	(revision 53617)
+++ common.mk	(revision 53618)
@@ -886,8 +886,10 @@ $(srcdir)/ext/json/parser/parser.c: $(sr https://github.com/ruby/ruby/blob/trunk/common.mk#L886
 	$(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 | \

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]