Skip to content

Commit

Permalink
* common.mk (dmyprobes.h): always create for make dist.
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nurse committed Nov 13, 2012
1 parent d8aaa43 commit db31b3d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
8 changes: 8 additions & 0 deletions ChangeLog
@@ -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.
Expand Down
6 changes: 2 additions & 4 deletions Makefile.in
Expand Up @@ -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
Expand Down Expand Up @@ -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::
Expand Down
5 changes: 4 additions & 1 deletion common.mk
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions win32/Makefile.sub
Expand Up @@ -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:/=\)
Expand Down

0 comments on commit db31b3d

Please sign in to comment.