archman updates

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 0bae854..2974747 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/* .
@@ -100,11 +100,6 @@ synth:
 #      $(xilinx)trce -intstyle xflow -e 3 -l 3 -s 6 -xml main main.ncd -o main.twr main.pcf
 
 
-manual: fleet.jar
-       $(java) -jar fleet.jar doc
-       cd .tmp; TEXINPUTS=$$TEXINPUTS:../doc/ pdflatex *.tex
-       open .tmp/*.pdf
-
 
 test:     fleet.jar; $(java) -jar fleet.jar             test ships/*.ship tests
 testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests
@@ -112,6 +107,20 @@ testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests
 generate: fleet.jar
        $(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/
 
+## Manual ####################################################################################
+
+svgs    = $(shell find doc -name \*.svg)
+%.eps: %.svg
+       DISPLAY= /Applications/Inkscape.app/Contents//Resources/bin/inkscape  -z --export-area-drawing $^ --export-eps=$@
+
+%.pdf: %.eps
+       epstopdf $^ --outfile=$@
+
+manual: fleet.jar $(svgs:%.svg=%.pdf)
+       $(java) -jar fleet.jar doc
+       cd .tmp; TEXINPUTS=$$TEXINPUTS:../doc/ pdflatex *.tex
+       open .tmp/*.pdf
+
 ## API docs ####################################################################################
 
 javadoc: