checkpoint

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 0bae854..9515eee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,9 +59,9 @@ verilog_files += $(shell find src -name \*.inc)
 runfpga: fleet.jar
        $(java) -jar fleet.jar target=fpga run
 
-upload: fleet.jar build/main.bit
+upload: fleet.jar build/fpga/main.bit
        mkdir -p build
-       rsync -zare ssh --progress --verbose build/main.bit root@bee441.megacz.com:/var/slipway/megacz.bit
+       rsync -zare ssh --progress --verbose build/fpga/main.bit root@bee441.megacz.com:/var/slipway/megacz.bit
 
 uploadtest:
        make upload
@@ -74,7 +74,7 @@ build/fpga/fabric.v: $(verilog_files) src/edu/berkeley/fleet/fpga/Fpga.java
        mkdir -p build/fpga
        $(java) $(cp) edu.berkeley.fleet.fpga.Fpga > build/fpga/fabric.v
 
-build/main.bit: build/fpga/fabric.v $(verilog_files)
+build/fpga/main.bit: build/fpga/fabric.v $(verilog_files)
        make fleet.jar
        cp src/edu/berkeley/fleet/fpga/* build/fpga
        for A in `find ships -name \*.ship`;\
@@ -83,7 +83,7 @@ build/main.bit: build/fpga/fabric.v $(verilog_files)
        $(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/
        rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
        time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_xilinx}'
-       scp ${host}:${remote_dir}/build/main.bit build/
+       scp ${host}:${remote_dir}/build/fpga/main.bit build/fpga/
 
 synth:
        cd build/fpga; ln -sf ../src/edu/berkeley/fleet/fpga/* .