From 6e0375e3e220350b20bbba8125b8243e11e8c810 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 16 Nov 2012 10:03:07 +0000 Subject: [PATCH] * Makefile.in (no-dtrace-probes.h): dmyprobes.h is in srcdir. * common.mk (dmyprobes.h): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ Makefile.in | 2 +- common.mk | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7db3442723..1a08978efc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 16 18:59:05 2012 NARUSE, Yui + + * Makefile.in (no-dtrace-probes.h): dmyprobes.h is in srcdir. + + * common.mk (dmyprobes.h): ditto. + Fri Nov 16 17:57:15 2012 Nobuyoshi Nakada * Makefile.in (probes.h): split build commands for dtrace-available diff --git a/Makefile.in b/Makefile.in index 4f329f410e..53a8309ff0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -331,7 +331,7 @@ yes-dtrace-probes.h: $(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/PROBES_H/g' probes.h.tmp > probes.h $(Q) $(RM) probes.h.tmp -no-dtrace-probes.h: dmyprobes.h +no-dtrace-probes.h: $(srcdir)/dmyprobes.h @$(ECHO) copying dummy probes.h $(Q) $(CP) $(srcdir)/dmyprobes.h probes.h diff --git a/common.mk b/common.mk index e457b2f409..dd49e7d9df 100644 --- a/common.mk +++ b/common.mk @@ -887,7 +887,7 @@ 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 +$(srcdir)/dmyprobes.h: {$(srcdir)}probes.d $(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@ prereq: incs srcs preludes PHONY