update Makefile

darcs-hash:20080410163637-5007d-dbb7ff60a12d57f13569586274339c16dfca2881.gz

diff --git a/Makefile b/Makefile
index 79f6f49..d40b0c0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,35 +13,21 @@ ghclibs = $(ghcroot)/rts/HSrts.jar:$(ghcroot)/libraries/base/HSbase.jar:$(ghcroo
 java =  java -Xmx800m
 java += $(profile) -cp src:$(ghclibs):$(sbp)/edu.berkeley.sbp.jar:build/class
 
+wix   = $(java) HaskellHelper
+
+install: build/class/Main.class build/class/Tib.class
+       aklog hcoop.net
+       aklog research.cs.berkeley.edu
+       $(wix) ~/wix/src/ ~/wix/dest/
+docs:
+       $(wix) xt2/docs/ ~/docs/
+
 $(sbp):
        darcs get --partial --repo-name=$@ http://research.cs.berkeley.edu/project/sbp/edu.berkeley.sbp 
 
 $(sbp)/edu.berkeley.sbp.jar: $(sbp)
        cd $(sbp); make edu.berkeley.sbp.jar
 
-run: build/class/Main.class build/class/Tib.class
-       $(java) HaskellHelper xt html
-
-install: build/class/Main.class build/class/Tib.class
-       $(java) HaskellHelper xt/ ~/www/
-
-install2: build/class/Main.class build/class/Tib.class
-#      $(java) HaskellHelper xt/slipway/ ~/www/slipway/
-       $(java) HaskellHelper xt/research/ ~/www/research/
-#      $(java) HaskellHelper xt/research.cs.berkeley.edu/ ~/www/research.cs.berkeley.edu/
-#      $(java) HaskellHelper xt/random/ ~/www/random/
-#      $(java) HaskellHelper xt/otherpeople/ ~/www/otherpeople/
-#      $(java) HaskellHelper xt/sbp ~/www/sbp
-#      $(java) HaskellHelper xt/software/wix ~/www/software/wix
-#      $(java) HaskellHelper xt/thoughts ~/www/thoughts
-#      $(java) HaskellHelper xt2 ~/
-
-docs:
-       $(java) HaskellHelper xt2/docs/ ~/docs/
-
-debug: build/class/Main.class build/class/Tib.class
-       $(java) -Dsbp.verbose=true HaskellHelper xt html
-
 wix.jar: build/class/Main.class build/class/Tib.class $(sbp)/edu.berkeley.sbp.jar
        rm -rf tmp
        mkdir tmp
@@ -67,4 +53,6 @@ build/class/Main.class: $(shell find src -name \*.lhs) $(sbp)/edu.berkeley.sbp.j
        cd src; $(ghc) -c -java Wix.lhs
        cd src; $(ghc) -c -java Main.lhs
 
+echojava:; echo $(java)
+
 clean:; rm -rf build
\ No newline at end of file