diff options
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 162 |
1 files changed, 81 insertions, 81 deletions
@@ -175,7 +175,7 @@ EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \ --make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" \ --gnumake=$(gnumake) --extflags="$(EXTLDFLAGS)" \ -- -INSTRUBY = $(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb +INSTRUBY = $(SUDO) $(RUNRUBY) -r./$(arch)-fake $(tooldir)/rbinstall.rb INSTRUBY_ARGS = $(SCRIPT_ARGS) \ --data-mode=$(INSTALL_DATA_MODE) \ --prog-mode=$(INSTALL_PROG_MODE) \ @@ -185,14 +185,14 @@ INSTALL_PROG_MODE = 0755 INSTALL_DATA_MODE = 0644 TESTSDIR = $(srcdir)/test -TOOL_TESTSDIR = $(srcdir)/tool/test +TOOL_TESTSDIR = $(tooldir)/test TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/ TESTWORKDIR = testwork TESTOPTS = $(RUBY_TESTOPTS) TESTRUN_SCRIPT = $(srcdir)/test.rb -COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl +COMPILE_PRELUDE = $(tooldir)/generic_erb.rb $(srcdir)/template/prelude.c.tmpl SHOWFLAGS = showflags @@ -224,9 +224,9 @@ mjit_config.h: Makefile # Other `-Dxxx`s preceding `-DMJIT_HEADER` will be removed in transform_mjit_header.rb. # So `-DMJIT_HEADER` should be passed first when rb_mjit_header.h is generated. $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJEXT) \ - $(TIMESTAMPDIR)/$(arch)/.time $(srcdir)/tool/mjit_tabs.rb $(PREP) + $(TIMESTAMPDIR)/$(arch)/.time $(tooldir)/mjit_tabs.rb $(PREP) $(ECHO) building $(@F:.time=.h) - $(MINIRUBY) $(srcdir)/tool/mjit_tabs.rb "$(MJIT_TABS)" \ + $(MINIRUBY) $(tooldir)/mjit_tabs.rb "$(MJIT_TABS)" \ $(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new $(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new @@ -234,10 +234,10 @@ $(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(M $(MJIT_MIN_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: \ $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time \ - $(srcdir)/tool/transform_mjit_header.rb $(PREP) \ + $(tooldir)/transform_mjit_header.rb $(PREP) \ $(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h $(ECHO) building $@ - $(MINIRUBY) $(srcdir)/tool/transform_mjit_header.rb "$(CC) $(ARCH_FLAG) $(CFLAGS)" $(MJIT_HEADER:.h=)$(MJIT_HEADER_ARCH).h $@ + $(MINIRUBY) $(tooldir)/transform_mjit_header.rb "$(CC) $(ARCH_FLAG) $(CFLAGS)" $(MJIT_HEADER:.h=)$(MJIT_HEADER_ARCH).h $@ $(Q) $(MAKEDIRS) $(MJIT_HEADER_INSTALL_DIR) $(Q) $(MAKE_LINK) $@ $(MJIT_HEADER_INSTALL_DIR)/$(@F) @@ -278,14 +278,14 @@ $(EXTS_MK): ext/configure-ext.mk $(srcdir)/template/exts.mk.tmpl \ gnumake=$(gnumake) MINIRUBY="$(MINIRUBY)" \ EXTLDFLAGS="$(EXTLDFLAGS)" srcdir="$(srcdir)" $(ECHO) generating makefile $@ - $(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \ + $(Q)$(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ -c \ $(srcdir)/template/exts.mk.tmpl --gnumake=$(gnumake) ext/configure-ext.mk: $(PREP) all-incs $(MKFILES) $(RBCONFIG) $(LIBRUBY) \ $(srcdir)/template/configure-ext.mk.tmpl $(ECHO) generating makefiles $@ $(Q)$(MAKEDIRS) $(@D) - $(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \ + $(Q)$(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ -c \ $(srcdir)/template/$(@F).tmpl --srcdir="$(srcdir)" \ --miniruby="$(MINIRUBY)" --script-args='$(SCRIPT_ARGS)' @@ -300,7 +300,7 @@ exts-note: $(EXTS_MK) $(Q)$(MAKE) $(EXTS_NOTE) ext/extinit.c: $(srcdir)/template/extinit.c.tmpl - $(Q)$(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ -c \ + $(Q)$(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ -c \ $(srcdir)/template/extinit.c.tmpl $(EXTINITS) prog: program wprogram @@ -331,9 +331,9 @@ $(CAPIOUT)/.timestamp: Doxyfile $(PREP) -$(Q) $(DOXYGEN) -b $(Q) $(MINIRUBY) -e 'File.open(ARGV[0], "w"){'"|f|"' f.puts(Time.now)}' "$@" -Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG) +Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(tooldir)/generic_erb.rb $(RBCONFIG) $(ECHO) generating $@ - $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \ + $(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \ --srcdir="$(srcdir)" --miniruby="$(MINIRUBY)" program: $(SHOWFLAGS) $(PROGRAM) @@ -457,7 +457,7 @@ post-no-install-all:: post-no-install-local post-no-install-ext post-no-install- @$(NULLCMD) uninstall: $(INSTALLED_LIST) sudo-precheck - $(Q)$(SUDO) $(MINIRUBY) $(srcdir)/tool/rbuninstall.rb --destdir=$(DESTDIR) $(INSTALLED_LIST) + $(Q)$(SUDO) $(MINIRUBY) $(tooldir)/rbuninstall.rb --destdir=$(DESTDIR) $(INSTALLED_LIST) reinstall: all uninstall install @@ -734,10 +734,10 @@ no-fake -fake: PHONY # really doesn't depend on .o, just ensure newer than headers which # version.o depends on. -$(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(srcdir)/tool/generic_erb.rb version.$(OBJEXT) miniruby$(EXEEXT) +$(arch)-fake.rb: $(srcdir)/template/fake.rb.in $(tooldir)/generic_erb.rb version.$(OBJEXT) miniruby$(EXEEXT) $(ECHO) generating $@ $(Q) $(CPP) -DRUBY_EXPORT $(INCFLAGS) $(CPPFLAGS) "$(srcdir)/version.c" | \ - $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \ + $(BOOTSTRAPRUBY) "$(tooldir)/generic_erb.rb" -o $@ "$(srcdir)/template/fake.rb.in" \ i=- srcdir="$(srcdir)" BASERUBY="$(BASERUBY)" btest: $(TEST_RUNNABLE)-btest @@ -797,13 +797,13 @@ extconf: $(PREP) $(Q) $(MAKEDIRS) "$(EXTCONFDIR)" $(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS) -$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h +$(RBCONFIG): $(tooldir)/mkconfig.rb config.status $(srcdir)/version.h $(Q)$(BOOTSTRAPRUBY) -n \ -e 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \ -e 'END{abort "UNICODE version mismatch: #{mis}" unless mis.empty?}' \ -e '(mis.delete(ARGF.path); ARGF.close) if /ONIG_UNICODE_VERSION_STRING +"#{Regexp.quote(version)}"/o' \ $(UNICODE_VERSION) $(UNICODE_DATA_HEADERS) - $(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb \ + $(Q)$(BOOTSTRAPRUBY) $(tooldir)/mkconfig.rb \ -arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \ -install_name=$(RUBY_INSTALL_NAME) \ -so_name=$(RUBY_SO_NAME) \ @@ -824,8 +824,8 @@ yes-test-spec: test-spec-precheck no-test-spec: RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable -runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY - $(Q) $(MINIRUBY) $(srcdir)/tool/mkrunnable.rb -v $(EXTOUT) +runnable: $(RUNNABLE) prog $(tooldir)/mkrunnable.rb PHONY + $(Q) $(MINIRUBY) $(tooldir)/mkrunnable.rb -v $(EXTOUT) yes-runnable: PHONY encs: enc trans @@ -859,17 +859,17 @@ $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc PHONY: -{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed {$(VPATH)}id.h +{$(VPATH)}parse.c: {$(VPATH)}parse.y $(tooldir)/ytab.sed {$(VPATH)}id.h {$(VPATH)}parse.h: {$(VPATH)}parse.c {$(srcdir)}.y.c: $(ECHO) generating $@ - $(Q)$(BASERUBY) $(srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y - $(Q)$(BASERUBY) $(srcdir)/tool/pure_parser.rb parse.tmp.y $(YACC) + $(Q)$(BASERUBY) $(tooldir)/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y + $(Q)$(BASERUBY) $(tooldir)/pure_parser.rb parse.tmp.y $(YACC) $(Q)$(RM) parse.tmp.y.bak $(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y $(Q)$(RM) parse.tmp.y - $(Q)sed -f $(srcdir)/tool/ytab.sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new + $(Q)sed -f $(tooldir)/ytab.sed -e "/^#/s|parse\.tmp\.[iy]|$(SRC_FILE)|" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new $(Q)$(MV) $@.new $@ $(Q)sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse.*\.y/d" y.tab.h > $(@:.c=.h) $(Q)$(RM) y.tab.c y.tab.h @@ -961,14 +961,14 @@ win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}win32/file.h \ win32/file.$(OBJEXT): {$(VPATH)}win32/file.c {$(VPATH)}win32/file.h \ $(RUBY_H_INCLUDES) $(PLATFORM_D) -$(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb +$(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(tooldir)/transcode-tblgen.rb $(Q) $(MAKEDIRS) $(@D) - $(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans + $(Q) $(BASERUBY) "$(tooldir)/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans enc/trans/newline.$(OBJEXT): $(NEWLINE_C) -verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb +verconf.h: $(srcdir)/template/verconf.h.tmpl $(tooldir)/generic_erb.rb $(ECHO) creating $@ - $(Q) $(BOOTSTRAPRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl + $(Q) $(BOOTSTRAPRUBY) "$(tooldir)/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl ruby-glommed.$(OBJEXT): $(OBJS) @@ -978,23 +978,23 @@ INSNS2VMOPT = --srcdir="$(srcdir)" srcs_vpath = {$(VPATH)} -inc_common_headers = $(srcdir)/tool/ruby_vm/views/_copyright.erb $(srcdir)/tool/ruby_vm/views/_notice.erb -$(srcs_vpath)opt_sc.inc: $(srcdir)/tool/ruby_vm/views/opt_sc.inc.erb $(inc_common_headers) -$(srcs_vpath)optinsn.inc: $(srcdir)/tool/ruby_vm/views/optinsn.inc.erb $(inc_common_headers) -$(srcs_vpath)optunifs.inc: $(srcdir)/tool/ruby_vm/views/optunifs.inc.erb $(inc_common_headers) -$(srcs_vpath)insns.inc: $(srcdir)/tool/ruby_vm/views/insns.inc.erb $(inc_common_headers) -$(srcs_vpath)insns_info.inc: $(srcdir)/tool/ruby_vm/views/insns_info.inc.erb $(inc_common_headers) \ - $(srcdir)/tool/ruby_vm/views/_insn_type_chars.erb $(srcdir)/tool/ruby_vm/views/_insn_name_info.erb \ - $(srcdir)/tool/ruby_vm/views/_insn_len_info.erb $(srcdir)/tool/ruby_vm/views/_insn_operand_info.erb \ - $(srcdir)/tool/ruby_vm/views/_attributes.erb $(srcdir)/tool/ruby_vm/views/_comptime_insn_stack_increase.erb \ - $(srcdir)/tool/ruby_vm/views/_insn_sp_pc_dependency.erb -$(srcs_vpath)vmtc.inc: $(srcdir)/tool/ruby_vm/views/vmtc.inc.erb $(inc_common_headers) -$(srcs_vpath)vm.inc: $(srcdir)/tool/ruby_vm/views/vm.inc.erb $(inc_common_headers) \ - $(srcdir)/tool/ruby_vm/views/_insn_entry.erb $(srcdir)/tool/ruby_vm/views/_trace_instruction.erb -$(srcs_vpath)mjit_compile.inc: $(srcdir)/tool/ruby_vm/views/mjit_compile.inc.erb $(inc_common_headers) \ - $(srcdir)/tool/ruby_vm/views/_mjit_compile_insn.erb $(srcdir)/tool/ruby_vm/views/_mjit_compile_send.erb \ - $(srcdir)/tool/ruby_vm/views/_mjit_compile_ivar.erb \ - $(srcdir)/tool/ruby_vm/views/_mjit_compile_insn_body.erb $(srcdir)/tool/ruby_vm/views/_mjit_compile_pc_and_sp.erb +inc_common_headers = $(tooldir)/ruby_vm/views/_copyright.erb $(tooldir)/ruby_vm/views/_notice.erb +$(srcs_vpath)opt_sc.inc: $(tooldir)/ruby_vm/views/opt_sc.inc.erb $(inc_common_headers) +$(srcs_vpath)optinsn.inc: $(tooldir)/ruby_vm/views/optinsn.inc.erb $(inc_common_headers) +$(srcs_vpath)optunifs.inc: $(tooldir)/ruby_vm/views/optunifs.inc.erb $(inc_common_headers) +$(srcs_vpath)insns.inc: $(tooldir)/ruby_vm/views/insns.inc.erb $(inc_common_headers) +$(srcs_vpath)insns_info.inc: $(tooldir)/ruby_vm/views/insns_info.inc.erb $(inc_common_headers) \ + $(tooldir)/ruby_vm/views/_insn_type_chars.erb $(tooldir)/ruby_vm/views/_insn_name_info.erb \ + $(tooldir)/ruby_vm/views/_insn_len_info.erb $(tooldir)/ruby_vm/views/_insn_operand_info.erb \ + $(tooldir)/ruby_vm/views/_attributes.erb $(tooldir)/ruby_vm/views/_comptime_insn_stack_increase.erb \ + $(tooldir)/ruby_vm/views/_insn_sp_pc_dependency.erb +$(srcs_vpath)vmtc.inc: $(tooldir)/ruby_vm/views/vmtc.inc.erb $(inc_common_headers) +$(srcs_vpath)vm.inc: $(tooldir)/ruby_vm/views/vm.inc.erb $(inc_common_headers) \ + $(tooldir)/ruby_vm/views/_insn_entry.erb $(tooldir)/ruby_vm/views/_trace_instruction.erb +$(srcs_vpath)mjit_compile.inc: $(tooldir)/ruby_vm/views/mjit_compile.inc.erb $(inc_common_headers) \ + $(tooldir)/ruby_vm/views/_mjit_compile_insn.erb $(tooldir)/ruby_vm/views/_mjit_compile_send.erb \ + $(tooldir)/ruby_vm/views/_mjit_compile_ivar.erb \ + $(tooldir)/ruby_vm/views/_mjit_compile_insn_body.erb $(tooldir)/ruby_vm/views/_mjit_compile_pc_and_sp.erb BUILTIN_RB_SRCS = \ $(srcdir)/ast.rb \ @@ -1054,46 +1054,46 @@ incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \ insns: $(INSNS) -id.h: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl $(srcdir)/defs/id.def +id.h: $(tooldir)/generic_erb.rb $(srcdir)/template/id.h.tmpl $(srcdir)/defs/id.def $(ECHO) generating $@ - $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \ + $(Q) $(BASERUBY) $(tooldir)/generic_erb.rb --output=$@ \ $(srcdir)/template/id.h.tmpl -id.c: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.c.tmpl $(srcdir)/defs/id.def +id.c: $(tooldir)/generic_erb.rb $(srcdir)/template/id.c.tmpl $(srcdir)/defs/id.def $(ECHO) generating $@ - $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \ + $(Q) $(BASERUBY) $(tooldir)/generic_erb.rb --output=$@ \ $(srcdir)/template/id.c.tmpl -node_name.inc: $(srcdir)/tool/node_name.rb $(srcdir)/node.h +node_name.inc: $(tooldir)/node_name.rb $(srcdir)/node.h $(ECHO) generating $@ - $(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $(srcdir)/node.h > $@ + $(Q) $(BASERUBY) -n $(tooldir)/node_name.rb < $(srcdir)/node.h > $@ -encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl +encdb.h: $(PREP) $(tooldir)/generic_erb.rb $(srcdir)/template/encdb.h.tmpl $(ECHO) generating $@ - $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc + $(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc -transdb.h: $(PREP) srcs-enc $(srcdir)/tool/generic_erb.rb $(srcdir)/template/transdb.h.tmpl +transdb.h: $(PREP) srcs-enc $(tooldir)/generic_erb.rb $(srcdir)/template/transdb.h.tmpl $(ECHO) generating $@ - $(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans + $(Q) $(MINIRUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans enc/encinit.c: $(ENC_MK) $(srcdir)/enc/encinit.c.erb known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def $(ECHO) generating $@ - $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def + $(Q) $(BASERUBY) $(tooldir)/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def -vm_call_iseq_optimized.inc: $(srcdir)/tool/mk_call_iseq_optimized.rb +vm_call_iseq_optimized.inc: $(tooldir)/mk_call_iseq_optimized.rb $(ECHO) generating $@ - $(Q) $(BASERUBY) $(srcdir)/tool/mk_call_iseq_optimized.rb > $@ + $(Q) $(BASERUBY) $(tooldir)/mk_call_iseq_optimized.rb > $@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(BUILTIN_RB_SRCS) $(ECHO) generating $@ - $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -o $@ \ + $(Q) $(BASERUBY) $(tooldir)/generic_erb.rb -I$(srcdir) -o $@ \ $(srcdir)/template/prelude.c.tmpl $(BUILTIN_RB_SRCS) $(GOLF_PRELUDE_C): $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb $(ECHO) generating $@ - $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \ + $(Q) $(BASERUBY) $(tooldir)/generic_erb.rb -I$(srcdir) -c -o $@ \ $(srcdir)/template/prelude.c.tmpl golf_prelude.rb MAINCPPFLAGS = $(ENABLE_DEBUG_ENV:yes=-DRUBY_DEBUG_ENV=1) @@ -1102,10 +1102,10 @@ $(MAINOBJ): $(srcdir)/$(MAINSRC) $(ECHO) compiling $(srcdir)/$(MAINSRC) $(Q) $(CC) $(MAINCPPFLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$(srcdir)/$(MAINSRC) -{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb +{$(VPATH)}probes.dmyh: {$(srcdir)}probes.d $(tooldir)/gen_dummy_probes.rb probes.dmyh: - $(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@ + $(BASERUBY) $(tooldir)/gen_dummy_probes.rb $(srcdir)/probes.d > $@ probes.h: {$(VPATH)}probes.$(DTRACE_EXT) @@ -1116,10 +1116,10 @@ preludes: {$(srcdir)}golf_prelude.c {$(srcdir)}.rb.rbinc: $(ECHO) making $@ - $(Q) $(BASERUBY) $(srcdir)/tool/mk_builtin_loader.rb $< + $(Q) $(BASERUBY) $(tooldir)/mk_builtin_loader.rb $< -builtin_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(srcdir)/tool/mk_builtin_binary.rb - $(Q) $(MINIRUBY) $(srcdir)/tool/mk_builtin_binary.rb --cross=$(CROSS_COMPILING) +builtin_binary.inc: $(PREP) $(BUILTIN_RB_SRCS) $(tooldir)/mk_builtin_binary.rb + $(Q) $(MINIRUBY) $(tooldir)/mk_builtin_binary.rb --cross=$(CROSS_COMPILING) $(BUILTIN_RB_INCS): $(top_srcdir)/tool/mk_builtin_loader.rb @@ -1129,8 +1129,8 @@ $(srcdir)/revision.h: revision.tmp:: $(Q) $(NULLCMD) > $@ -revision.$(HAVE_BASERUBY:yes=tmp):: $(srcdir)/version.h $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE) - $(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb -q --revision.h --srcdir="$(srcdir)" > $@ +revision.$(HAVE_BASERUBY:yes=tmp):: $(srcdir)/version.h $(tooldir)/file2lastrev.rb $(REVISION_FORCE) + $(Q) $(BASERUBY) $(tooldir)/file2lastrev.rb -q --revision.h --srcdir="$(srcdir)" > $@ $(REVISION_H): revision.tmp $(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp @@ -1154,7 +1154,7 @@ $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list $(srcdir)/ext/date Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. BASERUBY="$(BASERUBY)" $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ - $(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.ac + $(tooldir)/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.ac $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ sed '/AUTOGENERATED/q' depend | \ @@ -1162,7 +1162,7 @@ $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \ Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)" $(@F) $(srcdir)/ext/rbconfig/sizeof/limits.c: $(srcdir)/ext/rbconfig/sizeof/depend \ - $(srcdir)/tool/generic_erb.rb $(srcdir)/template/limits.c.tmpl + $(tooldir)/generic_erb.rb $(srcdir)/template/limits.c.tmpl $(ECHO) generating $@ $(Q) $(CHDIR) $(@D) && \ sed '/AUTOGENERATED/q' depend | \ @@ -1193,10 +1193,10 @@ parse: fake miniruby$(EXEEXT) PHONY $(BTESTRUBY) --dump=parsetree_with_comment,insns $(TESTRUN_SCRIPT) bisect: PHONY - $(srcdir)/tool/bisect.sh miniruby $(srcdir) + $(tooldir)/bisect.sh miniruby $(srcdir) bisect-ruby: PHONY - $(srcdir)/tool/bisect.sh ruby $(srcdir) + $(tooldir)/bisect.sh ruby $(srcdir) COMPARE_RUBY = $(BASERUBY) BENCH_RUBY = $(RUNRUBY) @@ -1244,7 +1244,7 @@ lldb-ruby: $(PROGRAM) PHONY DISTPKGS = gzip,zip,all dist: - $(BASERUBY) $(srcdir)/tool/make-snapshot \ + $(BASERUBY) $(tooldir)/make-snapshot \ -srcdir=$(srcdir) -packages=$(DISTPKGS) \ -unicode-version=$(UNICODE_VERSION) \ tmp $(RELNAME) @@ -1329,7 +1329,7 @@ no-test-bundled-gems: # TEST_BUNDLED_GEMS_ALLOW_FAILURES = test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS) - $(Q) $(XRUBY) $(srcdir)/tool/test-bundled-gems.rb + $(Q) $(XRUBY) $(tooldir)/test-bundled-gems.rb test-bundler-precheck: $(arch)-fake.rb programs @@ -1392,21 +1392,21 @@ update-unicode: $(UNICODE_FILES) $(UNICODE_PROPERTY_FILES) \ CACHE_DIR = $(srcdir)/.downloaded-cache UNICODE_DOWNLOAD = \ - $(BASERUBY) $(srcdir)/tool/downloader.rb \ + $(BASERUBY) $(tooldir)/downloader.rb \ --cache-dir=$(CACHE_DIR) \ --unicode-beta $(UNICODE_BETA) \ -d $(UNICODE_SRC_DATA_DIR) \ -p $(UNICODE_VERSION)/ucd \ -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode UNICODE_AUXILIARY_DOWNLOAD = \ - $(BASERUBY) $(srcdir)/tool/downloader.rb \ + $(BASERUBY) $(tooldir)/downloader.rb \ --cache-dir=$(CACHE_DIR) \ --unicode-beta $(UNICODE_BETA) \ -d $(UNICODE_SRC_DATA_DIR)/auxiliary \ -p $(UNICODE_VERSION)/ucd/auxiliary \ -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode UNICODE_EMOJI_DOWNLOAD = \ - $(BASERUBY) $(srcdir)/tool/downloader.rb \ + $(BASERUBY) $(tooldir)/downloader.rb \ --cache-dir=$(CACHE_DIR) \ --unicode-beta $(UNICODE_BETA) \ -d $(UNICODE_SRC_EMOJI_DATA_DIR) \ @@ -1443,11 +1443,11 @@ touch-unicode-files: touch $(UNICODE_SRC_DATA_DIR)/.unicode-tables.time $(UNICODE_DATA_HEADERS) UNICODE_TABLES_TIMESTAMP = yes -$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ +$(UNICODE_SRC_DATA_DIR)/.unicode-tables.time: $(tooldir)/generic_erb.rb \ $(srcdir)/template/unicode_norm_gen.tmpl \ $(ALWAYS_UPDATE_UNICODE:yes=update-unicode) $(Q) $(MAKE) $(@D) - $(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \ + $(Q) $(BASERUBY) $(tooldir)/generic_erb.rb \ -c $(UNICODE_TABLES_TIMESTAMP:yes=-t$@) \ -o $(srcdir)/lib/unicode_normalize/tables.rb \ -I $(srcdir) \ @@ -1458,14 +1458,14 @@ $(UNICODE_SRC_DATA_DIR): $(gnumake_recursive)$(Q) $(MAKEDIRS) $@ $(UNICODE_HDR_DIR)/$(ALWAYS_UPDATE_UNICODE:yes=name2ctype.h): \ - $(srcdir)/tool/enc-unicode.rb \ + $(tooldir)/enc-unicode.rb \ $(UNICODE_SRC_DATA_DIR)/UnicodeData.txt \ $(UNICODE_PROPERTY_FILES) \ $(UNICODE_EMOJI_FILES) $(UNICODE_HDR_DIR)/name2ctype.h: $(MAKEDIRS) $(@D) - $(BOOTSTRAPRUBY) $(srcdir)/tool/enc-unicode.rb --header \ + $(BOOTSTRAPRUBY) $(tooldir)/enc-unicode.rb --header \ $(UNICODE_SRC_DATA_DIR) $(UNICODE_SRC_EMOJI_DATA_DIR) > $@.new $(MV) $@.new $@ @@ -1523,7 +1523,7 @@ sudo-precheck: PHONY @$(SUDO) echo > $(NULL) update-man-date: PHONY - -$(Q) $(BASERUBY) -I"$(srcdir)/tool/lib" -rvcs -i -p \ + -$(Q) $(BASERUBY) -I"$(tooldir)/lib" -rvcs -i -p \ -e 'BEGIN{@vcs=VCS.detect(ARGV.shift)}' \ -e '$$_.sub!(/^(\.Dd ).*/){$$1+@vcs.modified(ARGF.path).strftime("%B %d, %Y")}' \ "$(srcdir)" "$(srcdir)"/man/*.1 @@ -1531,7 +1531,7 @@ update-man-date: PHONY .PHONY: ChangeLog ChangeLog: $(ECHO) Generating $@ - -$(Q) $(BASERUBY) -I"$(srcdir)/tool/lib" -rvcs \ + -$(Q) $(BASERUBY) -I"$(tooldir)/lib" -rvcs \ -e 'VCS.detect(ARGV[0]).export_changelog("@", nil, nil, ARGV[1])' \ "$(srcdir)" $@ |