nobu	2012-11-16 17:57:17 +0900 (Fri, 16 Nov 2012)

  New Revision: 37679

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

  Log:
    Makefile.in: split probes.h commands
    
    * Makefile.in (probes.h): split build commands for dtrace-available
      and unavailable platforms.

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 37678)
+++ configure.in	(revision 37679)
@@ -395,6 +395,12 @@
 AS_CASE(["$target_os"],
 [freebsd*], [DTRACE=]
 )
+if test -n "$DTRACE"; then
+    DTRACE_AVAILABLE=yes
+else
+    DTRACE_AVAILABLE=no
+fi
+AC_SUBST(DTRACE_AVAILABLE)
 
 RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37678)
+++ ChangeLog	(revision 37679)
@@ -1,5 +1,8 @@
-Fri Nov 16 17:56:47 2012  Nobuyoshi Nakada  <nobu@r...>
+Fri Nov 16 17:57:15 2012  Nobuyoshi Nakada  <nobu@r...>
 
+	* Makefile.in (probes.h): split build commands for dtrace-available
+	  and unavailable platforms.
+
 	* Makefile.in (incs): probes.h is a platform dependent file, so it
 	  cannot be a part of prereq target.  move it to all-incs.
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 37678)
+++ Makefile.in	(revision 37679)
@@ -148,6 +148,7 @@
 VCS           = @VCS@
 VCSUP         = @VCSUP@
 DTRACE        = @DTRACE@
+DTRACE_AVAILABLE = @DTRACE_AVAILABLE@
 
 OBJEXT        = @OBJEXT@
 ASMEXT        = S
@@ -322,16 +323,18 @@
 	@$(ECHO) preprocessing $<
 	$(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
 
-probes.h: dmyprobes.h
+probes.h: $(DTRACE_AVAILABLE)-dtrace-probes.h
+
+yes-dtrace-probes.h:
 	@$(ECHO) translating probes $(srcdir)/probes.d
-	$(Q)if test -n '$(DTRACE)'; then \
-	  $(DTRACE) -o $@.tmp -h -s $(srcdir)/probes.d; \
-	  sed -e 's/RUBY_/RUBY_DTRACE_/g' $@.tmp | sed -e 's/PROBES_H_TMP/PROBES_H/g' >$@; \
-	  $(RM) $@.tmp; \
-	else \
-	  $(CP) $(srcdir)/dmyprobes.h probes.h; \
-	fi
+	$(Q) $(DTRACE) -o probes.h -h -s $(srcdir)/probes.d
+	$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/PROBES_H/g' probes.h.tmp > probes.h
+	$(Q) $(RM) probes.h.tmp
 
+no-dtrace-probes.h: dmyprobes.h
+	@$(ECHO) copying dummy probes.h
+	$(Q) $(CP) $(srcdir)/dmyprobes.h probes.h
+
 clean-local::
 	$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
 		enc/encinit.c enc/encinit.$(OBJEXT)

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