diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | common.mk | 10 | ||||
| -rw-r--r-- | win32/Makefile.sub | 3 |
4 files changed, 17 insertions, 10 deletions
@@ -1,3 +1,7 @@ +Tue Nov 13 15:34:35 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * common.mk Makefile.in win32/Makefile.sub (.d.h): it's not common. + Tue Nov 13 12:27:11 2012 NARUSE, Yui <naruse@ruby-lang.org> * configure.in: disable dtrace because it doesn't work on FreeBSD. diff --git a/Makefile.in b/Makefile.in index de8b1328e6..14131ce963 100644 --- a/Makefile.in +++ b/Makefile.in @@ -321,6 +321,16 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd @$(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) @@ -614,16 +614,6 @@ VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}thread_$(THREAD_MODEL).h \ {$(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) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 7fc7d5b1e5..cb69098864 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1048,6 +1048,9 @@ $(ruby_pc): $(RBCONFIG) 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 $@ |