1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-11-13 06:35:30 +00:00
parent 864d96066d
commit aec93c2283
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> Tue Nov 13 12:27:11 2012 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in: disable dtrace because it doesn't work on FreeBSD. * configure.in: disable dtrace because it doesn't work on FreeBSD.

10
Makefile.in
View File

@ -321,6 +321,16 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
@$(ECHO) preprocessing $< @$(ECHO) preprocessing $<
$(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@ $(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:: clean-local::
$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \ $(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
enc/encinit.c enc/encinit.$(OBJEXT) enc/encinit.c enc/encinit.$(OBJEXT)

10
common.mk
View File

@ -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 \ {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}ruby_atomic.h \
$(ID_H_INCLUDES) $(PROBES_H_INCLUDES) $(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 addr2line.$(OBJEXT): {$(VPATH)}addr2line.c {$(VPATH)}addr2line.h {$(VPATH)}config.h
array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \ array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
$(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES) $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES)

3
win32/Makefile.sub
View File

@ -1048,6 +1048,9 @@ $(ruby_pc): $(RBCONFIG)
lex.c: {$(srcdir)}lex.c.blt lex.c: {$(srcdir)}lex.c.blt
copy $(?:/=\) $@ copy $(?:/=\) $@
probes.h: {$(srcdir)}probes.d
$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $? > $@
enc/unicode/name2ctype.h: {$(srcdir)}enc/unicode/name2ctype.h.blt enc/unicode/name2ctype.h: {$(srcdir)}enc/unicode/name2ctype.h.blt
@if not exist $(@D:/=\) md $(@D:/=\) @if not exist $(@D:/=\) md $(@D:/=\)
$(ECHO) copying $@ $(ECHO) copying $@