fix adam-induced stupidity in makefile
authoradam <adam@megacz.com>
Mon, 19 Feb 2007 10:20:35 +0000 (11:20 +0100)
committeradam <adam@megacz.com>
Mon, 19 Feb 2007 10:20:35 +0000 (11:20 +0100)
Makefile

index 6fc6e6b..4b82b46 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,12 +10,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 -cp 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 ../../$@ .