makefile updates

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 1393c48..6481e68 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
 
 ## Fleeterpreter ##############################################################################
 
-interpreter_class = edu.berkeley.fleet.interpreter.Main
 cp                = -cp fleet.jar
 java              = java -Xmx500m
 
@@ -10,12 +9,12 @@ run: fleet.jar; $(java) $(cp) $(interpreter_class)
 fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src/edu/berkeley/fleet/assembler/fleet.g
        mkdir -p build/class/edu/berkeley/fleet/assembler/
        cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
-       javac -cp lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+       javac -classpath lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
        cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
        for A in `find ships -name \*.ship`;\
          do java -cp build/class edu.berkeley.fleet.Main expand $$A;\
          done
-       javac -cp build/class:lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+       javac -classpath build/class:lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
        echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
        cd build/class/; jar cmf manifest ../../$@ .
 
@@ -61,7 +60,7 @@ uploadtest:
 build/fabric.v: $(verilog_files) src/edu/berkeley/fleet/slipway/Slipway.java
        make fleet.jar
        mkdir -p build
-       $(java) $(cp) $(interpreter_class) --dump-fabric > build/fabric.v
+       $(java) $(cp) edu.berkeley.fleet.slipway.Slipway > build/fabric.v
 
 build/main.bit: build/fabric.v $(verilog_files)
        make fleet.jar
@@ -90,7 +89,8 @@ synth:
 doc: fleet.jar
        $(java) $(cp) edu.berkeley.fleet.doc.Doc < ships/Alu2.ship
 
-test: fleet.jar; $(java) -jar fleet.jar test tests/
+test:     fleet.jar; $(java) -jar fleet.jar             test tests/
+testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test tests/
 
 ## API docs ####################################################################################