add Scala support

[sbp.git] / Makefile

diff --git a/Makefile b/Makefile
index a5d9260..2f10cae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -63,12 +63,15 @@ boot: edu.berkeley.sbp.jar
                ../src/edu/berkeley/sbp/meta/meta.g \
                edu.berkeley.sbp.meta.MetaGrammar
 
-edu.berkeley.sbp.jar: $(shell find src -name \*.java)
+edu.berkeley.sbp.jar: $(shell find src -name \*.java -or -name \*.scala)
+       rm -rf bin
        mkdir -p bin
-       javac  -cp javax.servlet.jar -d bin -sourcepath src $^
+       javac  -cp javax.servlet.jar -d bin -sourcepath src `find src -name \*.java`
+       scalac -d bin -sourcepath src `find src -name \*.scala`
        echo 'Main-Class: edu.berkeley.sbp.misc.CommandLine' > bin/manifest
        cd bin; jar cmf manifest ../$@ .
 #-Xlint:unchecked
+
 javadoc:
        rm -rf doc/api
        mkdir -p doc/api