X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile;h=41d3ee547766e9857e2ab4b01edd63a120bdbb9d;hb=5339e1ca42108f2f39bcf45e15a06a05fe068f4e;hp=8d91b35f111b9ad407a29e6886a1dfa27fdc83b4;hpb=7e3cda1c8cfe2f1e91816277969391c6d91bfb6a;p=mate.git

diff --git a/Makefile b/Makefile
index 8d91b35..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,13 +17,13 @@ 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 $@)"
@@ -42,7 +42,7 @@ COMPILEF = $(basename $@).compile
 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