projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
697e1d8
)
makefile updates
author
adam
<adam@megacz.com>
Thu, 22 Feb 2007 15:32:42 +0000
(16:32 +0100)
committer
adam
<adam@megacz.com>
Thu, 22 Feb 2007 15:32:42 +0000
(16:32 +0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
4b82b46
..
6481e68
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,6
@@
## Fleeterpreter ##############################################################################
## Fleeterpreter ##############################################################################
-interpreter_class = edu.berkeley.fleet.interpreter.Main
cp = -cp fleet.jar
java = java -Xmx500m
cp = -cp fleet.jar
java = java -Xmx500m
@@
-61,7
+60,7
@@
uploadtest:
build/fabric.v: $(verilog_files) src/edu/berkeley/fleet/slipway/Slipway.java
make fleet.jar
mkdir -p build
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
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
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 ####################################################################################
## API docs ####################################################################################