nobu	2015-01-27 14:39:52 +0900 (Tue, 27 Jan 2015)

  New Revision: 49419

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

  Log:
    Makefile.in: dtrace-specific stuffs
    
    * Makefile.in (DTRACE_DEPENDENT_OBJS): move dtrace-specific stuffs
      from common.mk.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
Index: common.mk
===================================================================
--- common.mk	(revision 49418)
+++ common.mk	(revision 49419)
@@ -712,20 +712,6 @@ verconf.h: $(srcdir)/template/verconf.h. https://github.com/ruby/ruby/blob/trunk/common.mk#L712
 	$(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)"
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 49418)
+++ Makefile.in	(revision 49419)
@@ -130,6 +130,18 @@ LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L130
 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@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L172
 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 https://github.com/ruby/ruby/blob/trunk/Makefile.in#L398
 
 # 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)
 

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