X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;fp=Makefile;h=2f10cae952df16d1b45c4a1d4e9b3cca99ce51b0;hp=a5d9260fa16ee6e1b83d9a64e863de4ba767000d;hb=f8303d6b2e11b97707d8b63aa80a2b814e145693;hpb=dce3af8d6974a6c5b05955703de2e983f112b765

diff --git a/Makefile b/Makefile
index a5d9260..2f10cae 100644
--- 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