checkpoint

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 5c7aa9e..71898f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,16 @@
 
-run: fleet.jar
-       java -cp lib/edu.berkeley.sbp.jar:fleet.jar edu.berkeley.fleet.FleetParser < test.fleet
+run: fleeterpreter.jar
+       java -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.FleetParser < test.fleet
 
-applet: fleet.jar
-       java -cp lib/edu.berkeley.sbp.jar:fleet.jar edu.berkeley.fleet.FleetApplet < test.fleet
+applet: fleeterpreter.jar
 
-fleet.jar: $(shell find src -name \*.java) fleet.g
+java -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.FleetApplet < test.fleet
+
+fleeterpreter.jar: $(shell find src -name \*.java) fleet.g
        mkdir -p bin
        cp fleet.g bin
        cp test.fleet bin
        javac -cp lib/edu.berkeley.sbp.jar -d bin $(shell find src -name \*.java)
-       cd bin; jar cvf ../$@ .
+       cd bin; jar xvf ../lib/edu.berkeley.sbp.jar
+       echo 'Main-Class: edu.berkeley.fleet.FleetApplet' > bin/manifest
+       cd bin; jar cvmf manifest ../$@ .