X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile;h=41d3ee547766e9857e2ab4b01edd63a120bdbb9d;hb=d3f63d65d80aaab4ad8eac43ee1caea7dea09fbd;hp=55954ae8cfe96aae03f252afb352f5063ac37cc2;hpb=4f26fb4ff1b74f2ad38364478572083a6783d8dd;p=mate.git

diff --git a/Makefile b/Makefile
index 55954ae..41d3ee5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 SHELL := bash
 
 JAVAC := javac
-JAVA_FILES := $(wildcard tests/*.java java/lang/*.java java/io/*.java)
+JAVA_FILES := $(wildcard java/lang/*.java java/io/*.java)
 CLASS_FILES := $(JAVA_FILES:.java=.class)
 TEST_JAVA_FILES := $(wildcard tests/*.java)
 TEST_CLASS_FILES := $(TEST_JAVA_FILES:.java=.test)
@@ -17,25 +17,32 @@ GHC_LD := -optl-Xlinker -optl-x
 
 .PHONY: all test clean ghci
 
-all: mate $(CLASS_FILES)
+all: mate
 
 %: %.class mate
 	./mate $(basename $<)
 
 
-tests: mate $(TEST_CLASS_FILES)
+tests: mate $(TEST_JAVA_FILES:.java=.class) $(TEST_CLASS_FILES)
 
+CALLF = $(basename $@).call
+testcase = ./tools/openjdktest.sh "$(1) $(basename $@)"
 %.test: %.class mate
-	@./tools/openjdktest.sh $(basename $@)
-
+	@if [ -f $(CALLF) ]; \
+		then $(call testcase,`cat $(CALLF)`); \
+		else $(call testcase, ); fi
 
+COMPILEF = $(basename $@).compile
 %.class: %.java
-	$(JAVAC) $<
+	@if [ -f $(COMPILEF) ]; \
+		then $(SHELL) $(COMPILEF); \
+		else $(JAVAC) $<; fi
+	@echo "JAVAC $<"
 
 ffi/native.o: ffi/native.c
 	ghc -Wall -O2 -c $< -o $@
 
-mate: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
+mate: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o $(CLASS_FILES)
 	@mkdir -p build/release
 	ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD) -outputdir build/release