Makefile fixes

diff --git a/Makefile b/Makefile
index 8cca58c..300ab4f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,13 +17,13 @@ ship_files = $(shell find ships -name \*.ship)
 fleet.jar: $(java_files) $(ship_files) 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 -classpath lib/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+       javac -classpath lib/com.sun.async.test.jar:lib/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
        cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
        cd build/class/; jar xf ../../lib/ibex.jar
        for A in `find ships -name \*.ship`;\
          do java -cp fleet.jar:build/class edu.berkeley.fleet.Main expand $$A;\
          done
-       javac -classpath lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+       javac -classpath lib/com.sun.async.test.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
        echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
        jar cmf build/class/manifest $@ ships -C build/class .
 
@@ -359,8 +359,7 @@ testlocal: fleet.jar
        cd marina/testCode; \
          export PATH=/proj/async/cad/linux/bin/:$$PATH; \
          /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java \
-         -cp `pwd`/../../../lib/com.sun.async.test.jar \
-         -cp `pwd`/../../../fleet.jar \
+         -cp `pwd`/../../lib/com.sun.async.test.jar:`pwd`/../../fleet.jar \
          com.sun.vlsi.chips.marina.test.MarinaTest \
          -hsim \
          -testNum 3040
@@ -374,10 +373,10 @@ marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
        rm -f marina/testCode/marina.schematic-parasitics.spi
        rm -f marina/testCode/marina.xml
        cd marina/testCode; \
-         nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.delib
+         nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.jelib
 
 electric:
-       ${electric} marina/electric/aMarinaM.delib
+       ${electric} marina/electric/aMarinaM.jelib
 
 chaing:
        java -cp lib/com.sun.async.test.jar com.sun.async.test.ChainG marina/testCode/marina.xml