From 6cf85c1bd283a40e7174c9df0efe331af7ded635 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 22 Oct 2014 17:25:35 +0000 Subject: [PATCH] common.mk: update source tree * common.mk (after-update): update files under source tree. [ruby-core:65840] [Bug #10414] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ common.mk | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7c7b4fdfc..8cf02c7715 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 23 02:25:32 2014 Nobuyoshi Nakada + + * common.mk (after-update): update files under source tree. + [ruby-core:65840] [Bug #10414] + Wed Oct 22 22:38:59 2014 CHIKANAGA Tomoyuki * ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override diff --git a/common.mk b/common.mk index 55db39bc88..781dd8db17 100644 --- a/common.mk +++ b/common.mk @@ -913,8 +913,10 @@ INSNS2VMOPT = --srcdir="$(srcdir)" {$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl -srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c \ - srcs-lib srcs-ext srcs-enc +common-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c \ + srcs-lib srcs-ext + +srcs: common-srcs srcs-enc EXT_SRCS = $(srcdir)/ext/ripper/ripper.c $(srcdir)/ext/json/parser/parser.c \ $(srcdir)/ext/dl/callback/callback.c $(srcdir)/ext/rbconfig/sizeof/sizes.c @@ -1080,7 +1082,7 @@ dist: up:: -$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)" -after-update:: update-unicode update-gems +after-update:: update-unicode update-gems common-srcs update-config_files: PHONY $(Q) $(BASERUBY) -C "$(srcdir)/tool" \