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

* common.mk (dmyprobes.h): always create for make dist.

Browse Source 
* Makefile.in (probes.h): create or copy dmyprobes.h

* win32/Makefile.sub: only do copy dmyprobes.h.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-11-13 07:49:09 +00:00
parent d8aaa43074
commit db31b3dad5
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Nov 13 16:38:02 2012 NARUSE, Yui <naruse@ruby-lang.org>
* 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@ruby-lang.org>
* Makefile.in (.SUFFIX): .SUFFIX is needed here for .d.h on bsd make.

6
Makefile.in
View File

@ -170,8 +170,6 @@ MESSAGE_END = ; do echo "$$line"; done
configure_args = @configure_args@
#### End of variables
.SUFFIXES: .inc .h .c .y .i .d
all:
.DEFAULT: all
@ -323,14 +321,14 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
@$(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::

5
common.mk
View File

@ -460,7 +460,7 @@ distclean-platform: clean-platform
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 @@ golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.
$(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

4
win32/Makefile.sub
View File

@ -1048,8 +1048,8 @@ $(ruby_pc): $(RBCONFIG)
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:/=\)