usa	2012-11-22 18:16:48 +0900 (Thu, 22 Nov 2012)

  New Revision: 37802

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

  Log:
    * common.mk, Makefile.in, win32/Makefile.sub (.dmyh.h): nmake merges
      explicit rules for same target, but not merges exlicit rules and
      implicit rules -- always explict rules win.  So, need to add an
      explist rule for probes.h.
      reported by Heesob Park at [Bug #7421] [ruby-core:49839]

  Modified files:
    trunk/ChangeLog
    trunk/Makefile.in
    trunk/common.mk
    trunk/win32/Makefile.sub

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37801)
+++ ChangeLog	(revision 37802)
@@ -1,3 +1,10 @@
+Thu Nov 22 18:11:27 2012  NAKAMURA Usaku  <usa@r...>
+
+	* common.mk, Makefile.in, win32/Makefile.sub (.dmyh.h): nmake merges
+	  explicit rules for same target, but not merges exlicit rules and
+	  implicit rules -- always explict rules win.  So, need to add an
+	  explist rule for probes.h.  [Bug #7421] [ruby-core:49839]
+
 Thu Nov 22 18:01:28 2012  NARUSE, Yui  <naruse@r...>
 
 	* Makefile.in (probes.o): add -C to ignore #include in probes.d.
Index: common.mk
===================================================================
--- common.mk	(revision 37801)
+++ common.mk	(revision 37802)
@@ -901,10 +901,6 @@
 
 probes.h: $(srcdir)/probes.$(DTRACE_EXT)
 
-{$(VPATH)}.dmyh.h:
-	@$(ECHO) copying dummy $(DEST_FILE)
-	$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
-
 prereq: incs srcs preludes PHONY
 
 preludes: {$(VPATH)}miniprelude.c
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 37801)
+++ win32/Makefile.sub	(revision 37802)
@@ -1067,6 +1067,10 @@
 	$(ECHO) compiling ext/extinit.c
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
+probes.h: {$(srcdir)}probes.dmyh
+	@$(ECHO) copying dummy $(DEST_FILE)
+	$(Q) $(CP) $(srcdir:/=\)\probes.dmyh $(OS_DEST_FILE)
+
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc
 
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 37801)
+++ Makefile.in	(revision 37802)
@@ -338,6 +338,10 @@
 	$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/PROBES_H/g' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
 	$(Q) $(RM) $@.tmp
 
+{$(VPATH)}.dmyh.h:
+	@$(ECHO) copying dummy $(DEST_FILE)
+	$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
+
 probes.@OBJEXT@: $(srcdir)/probes.d
 	@$(ECHO) processing probes in object files
 	$(Q) stamp="$*.stamp"; \

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