X-Git-Url: http://git.megacz.com/?p=wix.git;a=blobdiff_plain;f=Makefile;h=523c05bbb2178fe5463e40d57e88db04b2186af9;hp=7b7e98fc2a6687877337ff823464a03c06b8178e;hb=37d6f30e568ed38c76164bd11b09a35e32886f8f;hpb=5df967b6b407bb03d3ca25c37200bc4a45be28e0 diff --git a/Makefile b/Makefile index 7b7e98f..523c05b 100644 --- a/Makefile +++ b/Makefile @@ -34,19 +34,19 @@ $(sbp): $(sbp)/edu.berkeley.sbp.jar: $(sbp) cd $(sbp); make edu.berkeley.sbp.jar -wix.jar: build/class/Main.class build/class/Tib.class $(sbp)/edu.berkeley.sbp.jar +wix.jar: build/class/Main.class build/class/Tib.class lib/edu.berkeley.sbp.jar rm -rf tmp mkdir tmp - cd build/class; for A in $(lambdavm_jars) $(sbp)/edu.berkeley.sbp.jar; \ + cd build/class; for A in $(lambdavm_jars) lib/edu.berkeley.sbp.jar; \ do jar xvf $$A; done echo 'Main-Class: HaskellHelper' > build/manifest cp src/*.g build/class/ cd build/class; jar cvmf ../manifest ../../wix.jar . -build/class/Tib.class: $(shell find src -name \*.java) $(sbp)/edu.berkeley.sbp.jar - javac -d build/class -cp $(sbp)/edu.berkeley.sbp.jar $(shell find src -name \*.java) +build/class/Tib.class: $(shell find src -name \*.java) lib/edu.berkeley.sbp.jar + javac -d build/class -cp lib/edu.berkeley.sbp.jar $(shell find src -name \*.java) -build/class/Main.class: $(shell find src -name \*.lhs) $(sbp)/edu.berkeley.sbp.jar +build/class/Main.class: $(shell find src -name \*.lhs) lib/edu.berkeley.sbp.jar mkdir -p build/class/Text/PrettyPrint mkdir -p build/class/edu/berkeley/sbp/haskell/ mkdir -p build/hi