naruse	2012-11-13 16:49:09 +0900 (Tue, 13 Nov 2012)

  New Revision: 37640

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

  Log:
    * common.mk (dmyprobes.h): always create for make dist.
    
    * Makefile.in (probes.h): create or copy dmyprobes.h
    
    * win32/Makefile.sub: only do copy dmyprobes.h.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37639)
+++ ChangeLog	(revision 37640)
@@ -1,3 +1,11 @@
+Tue Nov 13 16:38:02 2012  NARUSE, Yui  <naruse@r...>
+
+	* common.mk (dmyprobes.h): always create for make dist.
+
+	* Makefile.in (probes.h): create or copy dmyprobes.h
+
+	* win32/Makefile.sub: only do copy dmyprobes.h.
+
 Tue Nov 13 15:37:21 2012  NARUSE, Yui  <naruse@r...>
 
 	* Makefile.in (.SUFFIX): .SUFFIX is needed here for .d.h on bsd make.
Index: common.mk
===================================================================
--- common.mk	(revision 37639)
+++ common.mk	(revision 37640)
@@ -460,7 +460,7 @@
 
 realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 realclean-local:: distclean-local
-	$(Q)$(RM) parse.c parse.h lex.c newline.c revision.h
+	$(Q)$(RM) parse.c parse.h lex.c newline.c revision.h dmyprobes.h
 realclean-ext::
 realclean-golf: distclean-golf
 realclean-capi: PHONY
@@ -887,6 +887,9 @@
 	$(ECHO) generating $@
 	$(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
 
+dmyprobes.h: {$(srcdir)}probes.d
+	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
+
 prereq: incs srcs preludes PHONY
 
 preludes: {$(VPATH)}miniprelude.c
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 37639)
+++ win32/Makefile.sub	(revision 37640)
@@ -1048,8 +1048,8 @@
 lex.c: {$(srcdir)}lex.c.blt
 	copy $(?:/=\) $@
 
-probes.h: {$(srcdir)}probes.d
-	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $? > $@
+probes.h: dmyprobes.h
+	copy dmyprobes.h probes.h
 
 enc/unicode/name2ctype.h: {$(srcdir)}enc/unicode/name2ctype.h.blt
 	@if not exist $(@D:/=\) md $(@D:/=\)
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 37639)
+++ Makefile.in	(revision 37640)
@@ -170,8 +170,6 @@
 configure_args = @configure_args@
 #### End of variables
 
-.SUFFIXES: .inc .h .c .y .i .d
-
 all:
 
 .DEFAULT: all
@@ -323,14 +321,14 @@
 	@$(ECHO) preprocessing $<
 	$(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
 
-.d.h:
+probes.h: dmyprobes.h
 	@$(ECHO) translating probes $<
 	$(Q)if test -n '$(DTRACE)'; then\
 	  $(DTRACE) -o $@.tmp -h -s $<; \
 	  sed -e 's/RUBY_/RUBY_DTRACE_/g' $@.tmp | sed -e 's/PROBES_H_TMP/PROBES_H/g' >$@; \
 	  $(RM) $@.tmp; \
 	else \
-	  $(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $< > $@; \
+	  $(CP) dmyprobes.h probes.h; \
 	fi
 
 clean-local::

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