summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-03 10:43:27 (GMT)
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-03 10:43:27 (GMT)
commitb7ff3d3b6811aaef57bb2d7bcef492aa3b921bd0 (patch)
tree5b0ae852acd12819feb04de72a5af3e1e3659869 /common.mk
parent3b4f1914821980204e79142900cd0a5bd411ee91 (diff)
* common.mk (ruby-glommed.o): dependency on $(OBJ) should be written
in common.mk (in which OBJ is defined) because of Makefile include and parse order. This partly reverts r49419. [ruby-dev:48849] [Bug #10808] * Makefile.in (ruby-glommed.o): ditto. * Makefile.in (ruby-glommed.o): remove excess $(DTRACE_OBJ) because it is included in $(OBJS) since r49451. * Makefile.in (probes.o): should depend on $(DTRACE_DEPENDENT_OBJS) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/common.mk b/common.mk
index c80044f..8612338 100644
--- a/common.mk
+++ b/common.mk
@@ -713,6 +713,8 @@ verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb
$(ECHO) creating $@
$(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl
+ruby-glommed.$(OBJEXT): $(OBJS)
+
$(OBJS): {$(VPATH)}config.h {$(VPATH)}missing.h
INSNS2VMOPT = --srcdir="$(srcdir)"