kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Makefile.in: dtrace-specific stuffs

Browse source 
* 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
This commit is contained in:
nobu 2015-01-27 05:39:52 +00:00
parent 8efd24bc28
commit fd8cf62f37
2 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Makefile.in
View file

@ -130,6 +130,18 @@ LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
LIBRUBY_RELATIVE = @LIBRUBY_RELATIVE@ LIBRUBY_RELATIVE = @LIBRUBY_RELATIVE@
LIBRUBY_A_OBJS = @LIBRUBY_A_OBJS@ 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@ THREAD_MODEL = @THREAD_MODEL@
PREP = @PREP@ PREP = @PREP@
@ -160,7 +172,7 @@ VCS = @VCS@
VCSUP = @VCSUP@ VCSUP = @VCSUP@
DTRACE = @DTRACE@ DTRACE = @DTRACE@
DTRACE_EXT = @DTRACE_EXT@ DTRACE_EXT = @DTRACE_EXT@
DTRACE_OBJ = @DTRACE_OBJ@ DTRACE_OBJ = @DTRACE_OBJ@
DTRACE_GLOMMED_OBJ = @DTRACE_GLOMMED_OBJ@ DTRACE_GLOMMED_OBJ = @DTRACE_GLOMMED_OBJ@
OBJEXT = @OBJEXT@ OBJEXT = @OBJEXT@
@ -386,7 +398,7 @@ probes.@OBJEXT@: $(srcdir)/probes.d
# DTrace static library hacks described here: # DTrace static library hacks described here:
# http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html # 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 @$(ECHO) generating a glommed object with DTrace probes for static library
$(Q) $(LD) -r -o $@ $(OBJS) $(DTRACE_OBJ) $(Q) $(LD) -r -o $@ $(OBJS) $(DTRACE_OBJ)

14
common.mk
View file

@ -712,20 +712,6 @@ verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb
$(ECHO) creating $@ $(ECHO) creating $@
$(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl $(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 $(OBJS): {$(VPATH)}config.h {$(VPATH)}missing.h
INSNS2VMOPT = --srcdir="$(srcdir)" INSNS2VMOPT = --srcdir="$(srcdir)"