Index: benchmark/Makefile.am
===================================================================
--- benchmark/Makefile.am	(revision 2a1af5b01d14b8abd60925736effb93bbbc0c221)
+++ benchmark/Makefile.am	(revision 88e139e475c5ed0929b5b5b6fee32cceebfeb2d5)
@@ -51,5 +51,5 @@
 	@${STATS} .result.log
 	@echo "------------------------------------------------------"
-	@rm -f a.out .result.log
+	@rm -f a.out .result.log *.class
 
 %.runquiet :
@@ -163,7 +163,7 @@
 
 ctxswitch-java_thread$(EXEEXT):
-	$(AM_V_JAVAC)javac $(srcdir)/ctxswitch/JavaThread.java
+	$(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
 	@echo "#!/bin/sh" > a.out
-	@echo "cd $(srcdir)/ctxswitch && java JavaThread" >> a.out
+	@echo "java JavaThread" >> a.out
 	@chmod a+x a.out
 
@@ -196,7 +196,7 @@
 
 mutex-java_thread$(EXEEXT):
-	$(AM_V_JAVAC)javac $(srcdir)/mutex/JavaThread.java
+	$(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
 	@echo "#!/bin/sh" > a.out
-	@echo "cd $(srcdir)/mutex && java JavaThread" >> a.out
+	@echo "java JavaThread" >> a.out
 	@chmod a+x a.out
 
@@ -226,7 +226,7 @@
 
 signal-java_thread$(EXEEXT):
-	@javac $(srcdir)/schedint/JavaThread.java
+	$(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
 	@echo "#!/bin/sh" > a.out
-	@echo "cd $(srcdir)/schedint && java JavaThread" >> a.out
+	@echo "java JavaThread" >> a.out
 	@chmod a+x a.out
 
@@ -284,7 +284,7 @@
 
 creation-java_thread$(EXEEXT):
-	$(AM_V_JAVAC)javac $(srcdir)/creation/JavaThread.java
+	$(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
 	@echo "#!/bin/sh" > a.out
-	@echo "cd $(srcdir)/creation && java JavaThread" >> a.out
+	@echo "java JavaThread" >> a.out
 	@chmod a+x a.out
 
Index: benchmark/Makefile.in
===================================================================
--- benchmark/Makefile.in	(revision 2a1af5b01d14b8abd60925736effb93bbbc0c221)
+++ benchmark/Makefile.in	(revision 88e139e475c5ed0929b5b5b6fee32cceebfeb2d5)
@@ -656,5 +656,5 @@
 	@${STATS} .result.log
 	@echo "------------------------------------------------------"
-	@rm -f a.out .result.log
+	@rm -f a.out .result.log *.class
 
 %.runquiet :
@@ -744,7 +744,7 @@
 
 ctxswitch-java_thread$(EXEEXT):
-	$(AM_V_JAVAC)javac $(srcdir)/ctxswitch/JavaThread.java
+	$(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
 	@echo "#!/bin/sh" > a.out
-	@echo "cd $(srcdir)/ctxswitch && java JavaThread" >> a.out
+	@echo "java JavaThread" >> a.out
 	@chmod a+x a.out
 
@@ -776,7 +776,7 @@
 
 mutex-java_thread$(EXEEXT):
-	$(AM_V_JAVAC)javac $(srcdir)/mutex/JavaThread.java
+	$(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
 	@echo "#!/bin/sh" > a.out
-	@echo "cd $(srcdir)/mutex && java JavaThread" >> a.out
+	@echo "java JavaThread" >> a.out
 	@chmod a+x a.out
 
@@ -805,7 +805,7 @@
 
 signal-java_thread$(EXEEXT):
-	@javac $(srcdir)/schedint/JavaThread.java
+	$(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
 	@echo "#!/bin/sh" > a.out
-	@echo "cd $(srcdir)/schedint && java JavaThread" >> a.out
+	@echo "java JavaThread" >> a.out
 	@chmod a+x a.out
 
@@ -860,7 +860,7 @@
 
 creation-java_thread$(EXEEXT):
-	$(AM_V_JAVAC)javac $(srcdir)/creation/JavaThread.java
+	$(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
 	@echo "#!/bin/sh" > a.out
-	@echo "cd $(srcdir)/creation && java JavaThread" >> a.out
+	@echo "java JavaThread" >> a.out
 	@chmod a+x a.out