[前][次][番号順一覧][スレッド一覧]

ruby-changes:25581

From: usa <ko1@a...>
Date: Tue, 13 Nov 2012 15:35:41 +0900 (JST)
Subject: [ruby-changes:25581] usa:r37638 (trunk): * common.mk Makefile.in win32/Makefile.sub (.d.h): it's not common.

usa	2012-11-13 15:35:30 +0900 (Tue, 13 Nov 2012)

  New Revision: 37638

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

  Log:
    * common.mk Makefile.in win32/Makefile.sub (.d.h): it's not common.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37637)
+++ ChangeLog	(revision 37638)
@@ -1,3 +1,7 @@
+Tue Nov 13 15:34:35 2012  NAKAMURA Usaku  <usa@r...>
+
+	* common.mk Makefile.in win32/Makefile.sub (.d.h): it's not common.
+
 Tue Nov 13 12:27:11 2012  NARUSE, Yui  <naruse@r...>
 
 	* configure.in: disable dtrace because it doesn't work on FreeBSD.
Index: common.mk
===================================================================
--- common.mk	(revision 37637)
+++ common.mk	(revision 37638)
@@ -614,16 +614,6 @@
 		     {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}ruby_atomic.h \
 		     $(ID_H_INCLUDES) $(PROBES_H_INCLUDES)
 
-.d.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 $< > $@; \
-	fi
-
 addr2line.$(OBJEXT): {$(VPATH)}addr2line.c {$(VPATH)}addr2line.h {$(VPATH)}config.h
 array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
   $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES)
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 37637)
+++ win32/Makefile.sub	(revision 37638)
@@ -1048,6 +1048,9 @@
 lex.c: {$(srcdir)}lex.c.blt
 	copy $(?:/=\) $@
 
+probes.h: {$(srcdir)}probes.d
+	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $? > $@
+
 enc/unicode/name2ctype.h: {$(srcdir)}enc/unicode/name2ctype.h.blt
 	@if not exist $(@D:/=\) md $(@D:/=\)
 	$(ECHO) copying $@
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 37637)
+++ Makefile.in	(revision 37638)
@@ -321,6 +321,16 @@
 	@$(ECHO) preprocessing $<
 	$(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
 
+.d.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 $< > $@; \
+	fi
+
 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/

[前][次][番号順一覧][スレッド一覧]