diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | common.mk | 5 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 |
4 files changed, 16 insertions, 7 deletions
@@ -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. diff --git a/Makefile.in b/Makefile.in index 1ea5c33f2e..a9c21fda37 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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:: @@ -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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index cb69098864..a073192497 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -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:/=\) |