summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-27 05:39:52 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-27 05:39:52 +0000
commitfd8cf62f37cd3530e5311ed681359241072a3f76 (patch)
treeeb1cc6545f18b22eaad6f332baed09fad71b61dc
parent8efd24bc280c048bae35d4ae43112ba6112caa6a (diff)
Makefile.in: dtrace-specific stuffs
* Makefile.in (DTRACE_DEPENDENT_OBJS): move dtrace-specific stuffs from common.mk. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49419 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in16
-rw-r--r--common.mk14
2 files changed, 14 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in
index e0b72f1..dfa3641 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -130,6 +130,18 @@ LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
LIBRUBY_RELATIVE = @LIBRUBY_RELATIVE@
LIBRUBY_A_OBJS = @LIBRUBY_A_OBJS@
+
+DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
+ eval.$(OBJEXT) \
+ gc.$(OBJEXT) \
+ hash.$(OBJEXT) \
+ load.$(OBJEXT) \
+ object.$(OBJEXT) \
+ parse.$(OBJEXT) \
+ string.$(OBJEXT) \
+ symbol.$(OBJEXT) \
+ vm.$(OBJEXT)
+
THREAD_MODEL = @THREAD_MODEL@
PREP = @PREP@
@@ -160,7 +172,7 @@ VCS = @VCS@
VCSUP = @VCSUP@
DTRACE = @DTRACE@
DTRACE_EXT = @DTRACE_EXT@
-DTRACE_OBJ = @DTRACE_OBJ@
+DTRACE_OBJ = @DTRACE_OBJ@
DTRACE_GLOMMED_OBJ = @DTRACE_GLOMMED_OBJ@
OBJEXT = @OBJEXT@
@@ -386,7 +398,7 @@ probes.@OBJEXT@: $(srcdir)/probes.d
# DTrace static library hacks described here:
# http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
-ruby-glommed.$(OBJEXT):
+ruby-glommed.$(OBJEXT): $(OBJS) $(DTRACE_OBJ)
@$(ECHO) generating a glommed object with DTrace probes for static library
$(Q) $(LD) -r -o $@ $(OBJS) $(DTRACE_OBJ)
diff --git a/common.mk b/common.mk
index c1341a7..1f2327a 100644
--- a/common.mk
+++ b/common.mk
@@ -712,20 +712,6 @@ 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
-DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
- eval.$(OBJEXT) \
- gc.$(OBJEXT) \
- hash.$(OBJEXT) \
- load.$(OBJEXT) \
- object.$(OBJEXT) \
- parse.$(OBJEXT) \
- string.$(OBJEXT) \
- symbol.$(OBJEXT) \
- vm.$(OBJEXT)
-
-probes.$(OBJEXT): $(DTRACE_DEPENDENT_OBJS)
-ruby-glommed.$(OBJEXT): $(OBJS) $(DTRACE_OBJ)
-
$(OBJS): {$(VPATH)}config.h {$(VPATH)}missing.h
INSNS2VMOPT = --srcdir="$(srcdir)"