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

ruby-changes:49588

From: nobu <ko1@a...>
Date: Tue, 9 Jan 2018 11:11:04 +0900 (JST)
Subject: [ruby-changes:49588] nobu:r61703 (trunk): gmake.mk: update srcdir files

nobu	2018-01-09 11:10:58 +0900 (Tue, 09 Jan 2018)

  New Revision: 61703

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

  Log:
    gmake.mk: update srcdir files
    
    * defs/gmake.mk (commit): update source files under the sources
      directory after commit.

  Modified files:
    trunk/common.mk
    trunk/defs/gmake.mk
Index: common.mk
===================================================================
--- common.mk	(revision 61702)
+++ common.mk	(revision 61703)
@@ -888,7 +888,8 @@ INSNS2VMOPT = --srcdir="$(srcdir)" https://github.com/ruby/ruby/blob/trunk/common.mk#L888
 
 {$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
 
-common-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}enc/trans/newline.c {$(VPATH)}id.c \
+srcs-vpath = {$(VPATH)}
+common-srcs: $(srcs-vpath)parse.c $(srcs-vpath)lex.c $(srcs-vpath)enc/trans/newline.c $(srcs-vpath)id.c \
 	     srcs-lib srcs-ext incs
 
 missing-srcs: $(srcdir)/missing/des_tables.c
Index: defs/gmake.mk
===================================================================
--- defs/gmake.mk	(revision 61702)
+++ defs/gmake.mk	(revision 61703)
@@ -139,7 +139,7 @@ $(TIMESTAMPDIR)/.exec.time: https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L139
 .PHONY: commit
 commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS)))
 	@$(BASERUBY) -C "$(srcdir)" -I./tool -rvcs -e 'VCS.detect(".").commit'
-	$(Q)$(MAKE) $(mflags) Q=$(Q) REVISION_FORCE=PHONY update-src srcs all-incs
+	$(Q)$(MAKE) $(mflags) Q=$(Q) srcs-vpath='$(srcdir)/' REVISION_FORCE=PHONY update-src srcs all-incs
 
 ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)
 extract-gems: update-gems

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

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