Makefile: fix for new javac version

[mate.git] / Makefile

diff --git a/Makefile b/Makefile
index b9033167dd764159eda5d0945982947257983124..c3fc8e8466172a3c219f58c16508ca9a90a02e5e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ COMPILEF = $(basename $@).compile
 %.class: %.java
        @if [ -f $(COMPILEF) ]; \
                then $(SHELL) $(COMPILEF); \
-               else $(JAVAC) $<; fi
+               else $(JAVAC) $(JAVA_FILES) $<; fi
        @echo "JAVAC $<"
 
 ffi/native.o: ffi/native.c
@@ -69,7 +69,8 @@ mate.dbg: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
        ghc --make $(DEBUGFLAGS) $(GHC_OPT) Mate.hs $(B_DEBUG)/ffi/trap.o -o $@ $(GHC_LD) -outputdir $(B_DEBUG)
 
 clean:
-       rm -rf $(BUILD) mate mate.dbg tags ffi/native.o tests/*.class Mate/*_stub.* \
+       rm -rf $(BUILD) mate mate.static mate.dbg tags ffi/native.o \
+               tests/*.class Mate/*_stub.* \
                jmate/lang/*.class jmate/io/*.class java/io/*.class \
                java/lang/{Integer,Character,String,System}.class