From 4ee0a8e740d4c9af11897e2999fd66c242d302dd Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Sep 2008 12:04:34 +0000
Subject: [PATCH] * common.mk: fix btest-* rules [ruby-dev:36528].   and remove
 obsolete rules.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19552 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  5 +++++
 common.mk | 30 +++++-------------------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9d3e7594e8..0cf97e0138 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 25 21:00:32 2008  Koichi Sasada  <ko1@atdot.net>
+
+	* common.mk: fix btest-* rules [ruby-dev:36528].
+	  and remove obsolete rules.
+
 Thu Sep 25 20:27:54 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* class.c (rb_make_metaclass): [BUG] Fixed a bus error
diff --git a/common.mk b/common.mk
index 31c996126e..d57043c0ba 100644
--- a/common.mk
+++ b/common.mk
@@ -359,16 +359,16 @@ check: test test-all
 btest: miniruby$(EXEEXT) PHONY
 	$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" $(OPTS)
 
-btest-miniruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
-	@$(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(MINIRUBY)" -q
+btest-ruby: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
+	@$(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib" -q
 
 test-sample: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
 	@$(MINIRUBY) $(srcdir)/rubytest.rb
 
-test-knownbug: miniruby$(EXEEXT) $(PROGRAM) PHONY
-	$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
+test-knownbug: miniruby$(EXEEXT) $(PROGRAM) $(RBCONFIG) PHONY
+	$(MINIRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM)" $(OPTS) $(srcdir)/KNOWNBUGS.rb
 
-test: test-sample btest-miniruby test-knownbug
+test: test-sample btest-ruby test-knownbug
 
 test-all:
 	$(RUNRUBY) "$(srcdir)/test/runner.rb" $(TESTS)
@@ -680,13 +680,6 @@ tbench: $(PROGRAM) PHONY
 	            --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
 	            --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
 
-aotc: $(PROGRAM) PHONY
-	./$(PROGRAM) -I$(srcdir)/lib $(srcdir)/bin/ruby2cext $(srcdir)/test.rb
-
-vmasm: vm.$(ASMEXT)
-
-# vm.o : CFLAGS += -fno-crossjumping
-
 run.gdb:
 	echo b ruby_debug_breakpoint           > run.gdb
 	echo '# handle SIGINT nostop'         >> run.gdb
@@ -699,13 +692,6 @@ run.gdb:
 gdb: miniruby$(EXEEXT) run.gdb PHONY
 	gdb -x run.gdb --quiet --args $(MINIRUBY) $(srcdir)/test.rb
 
-# Intel VTune
-
-vtune: miniruby$(EXEEXT)
-	vtl activity -c sampling -app ".\miniruby$(EXEEXT)","-I$(srcdir)/lib $(srcdir)/test.rb" run
-	vtl view -hf -mn miniruby$(EXEEXT) -sum -sort -cd
-	vtl view -ha -mn miniruby$(EXEEXT) -sum -sort -cd | $(RUNRUBY) $(srcdir)/tool/vtlh.rb > ha.lines
-
 dist: $(PREP) $(PROGRAM)
 	$(srcdir)/tool/make-snapshot . $(TARNAME)
 
@@ -713,12 +699,6 @@ up:
 	@$(VCS) up "$(srcdir)"
 	-@$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(srcdir)/revision.h"
 
-depends: PHONY
-	gcc $(XCFLAGS) -MM $(srcdir)/*.c > depends.txt
-
-vm_test.o: vm_test.c $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
-  vm_exec.c vm_insnhelper.c vm_insnhelper.h
-
 help: PHONY
 	@echo "                Makefile of Ruby"
 	@echo ""