diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 03:32:43 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-01-09 03:32:43 +0000 |
| commit | 445e11da5050524d48ce05a46b99f205102e8314 (patch) | |
| tree | 88ed86f2fdf0915b8552ab32866ad1cb1981c9d8 | |
| parent | a4c091a69723f57865e619ba031e3afdfc2b0d14 (diff) | |
probes.h including dummy header
* Makefile.in, win32/Makefile.sub (probes.h): include dummy header
instead of copying.
* common.mk (probes.dmyh): add nmake VPATH prefix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53481 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 9 |
3 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index f6b029506a..c0202b9c2a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -400,8 +400,8 @@ enc/jis/props.h: enc/jis/props.kwd $(Q) $(RM) $@.tmp .dmyh.h: - @$(ECHO) copying dummy $(DEST_FILE) - $(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE) + @$(ECHO) making dummy $(DEST_FILE) + $(Q)echo '#include "$(*F).dmyh"' > $@ probes.stamp: $(DTRACE_REBUILD_OBJS) $(Q) if test -f $@ -o -f probes.$(OBJEXT); then \ @@ -852,7 +852,7 @@ $(PRELUDE_C): $(COMPILE_PRELUDE) \ $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ $(srcdir)/template/prelude.c.tmpl golf_prelude.rb -probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb +{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb $(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@ probes.h: {$(VPATH)}probes.$(DTRACE_EXT) diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 336e56af3b..38d332f726 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1148,12 +1148,9 @@ ext/extinit.obj: ext/extinit.c $(SETUP) $(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c probes.h: {$(VPATH)}probes.dmyh - @$(ECHO) copying dummy $(DEST_FILE) - @if exist probes.dmyh (\ - $(Q) $(CP) probes.dmyh $(OS_DEST_FILE)\ - ) else (\ - $(Q) $(CP) $(srcdir:/=\)\probes.dmyh $(OS_DEST_FILE)\ - ) + @$(ECHO) making dummy <<$(DEST_FILE) +#include "$(*F).dmyh" +<<KEEP INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \ vmtc.inc vm.inc |