X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=43d6717d789c21bd280cc17d2972ea32dbb5e0fe;hp=3a9e7b5fd73d302f1d5eed4f5f6e44830ae14675;hb=a2008a0c57702f49ed7f8be682e4e29484fded38;hpb=a09bae7235677c1b3b77f827bdd6722a9e88a122

diff --git a/Makefile b/Makefile
index 3a9e7b5..43d6717 100644
--- a/Makefile
+++ b/Makefile
@@ -139,37 +139,7 @@ upload:
 ##   make runHaskellDemo JAVA_HOME=<java-home>
 ##
 
-ghc_version = $(shell ghc --version | sed 's_.*version \([0-9]*\.[0-9]*\).*_\1_')
-
-ifeq ($(ghc_version),6.5)
-patchghc    = patch -p0 < $(shell pwd)/misc/ghc-6.5-patch &&
-else
-patchghc    =
-endif
-
-ifeq ($(shell uname),Darwin)
-with_jvmdir = --with-jvmdir=/System/Library/Frameworks/JavaVM.framework/
-jvmlink     = -framework JavaVM -optl -fexceptions
-patchmac    = patch -p0 < $(shell pwd)/misc/intel-mac-patch &&
-linkopts    =
-platlink    = -L$(prefix)/lib/ -L$(JAVA_HOME)/jre/lib/i386/ -L$(JAVA_HOME)/jre/lib/i386/client/
-else
-with_jvmdir = --with-jvmdir=$(JAVA_HOME)
-jvmlink     = -ljava -ljvm -lverify
-patchmac    =
-linkopts    = -optl "-Wl,-rpath,$(JAVA_HOME)/jre/lib/i386/" -optl "-Wl,-rpath,$(JAVA_HOME)/jre/lib/i386/client/"
-platlink    =
-endif
-
-prefix          = $(shell pwd)/prefix
-jvm-bridge-site = umn.dl.sourceforge.net
-jvm-bridge-url  = http://$(jvm-bridge-site)/sourceforge/jvm-bridge/haskell-jvm-bridge-0.3.tar.gz
-
-#		The double -lHaskellJVMBridge is due to a circular link dep; the linux linker gets upset
-link            = $(platlink) -lstdc++ -lHaskellJVMBridge -lJVMBridge -lJVMInvocation -lHaskellJVMBridge $(jvmlink)
-packages        = -package haskell98 -package base -package rts
-ghc             = ghc -fglasgow-exts $(packages) -i$(prefix)/imports/
-bin             = $(prefix)/bin/
+include Makefile.haskell
 
 .jvm-bridge:
 	mkdir -p $(prefix)/src
@@ -205,11 +175,14 @@ bin/Header_%.o: edu.berkeley.sbp.jar .jvm-bridge
 	cd bin; $(bin)/MakeHeaderModule -module Header_$* -jar ../edu.berkeley.sbp.jar
 	cd bin; $(ghc) -c Header_$*.hs $(link)
 
-bin/Class_%.o: bin/Header_%.o
+bin/Class_%.o:
+	make bin/Header_$*.o
 	cd bin; $(bin)/MakeClassModule -import Header_Java -import Header_$* -cp ../edu.berkeley.sbp.jar `echo $* | sed s/_/./g`
 	cd bin; $(ghc) -c Class_$*.hs $(link)
 
-bin/JVM_%.o: bin/Class_%.o
+bin/JVM_%.o:
+	make bin/Class_$*.o
+	make bin/Header_$*.o
 	cd bin; echo -e $($*_list) | $(bin)/MakeJVMModule JVM_$*
 	cd bin; $(ghc) -c JVM_$*.hs $(link)
 
@@ -225,3 +198,15 @@ bin/HaskellDemo: src/SBP.hs \
 	cd bin; $(ghc) -i../src/ -c ../src/HaskellDemo.hs $(link) -o HaskellDemo.o
 	cd bin; for A in *.hs; do $(ghc) -c $$A $(link); done
 	cd bin; $(ghc) $(linkopts) $(link) -o HaskellDemo *.o
+
+
+ghcroot = /usr/local/brian/ghc
+ghc = $(ghcroot)/compiler/ghc-inplace
+ghclibs = $(ghcroot)/rts/HSrts.jar:$(ghcroot)/libraries/base/HSbase.jar:$(ghcroot)/libraries/stm/HSstm.jar
+
+bin/Main.class: src/Main.lhs src/SBP.lhs
+	cd src; $(ghc) -fglasgow-exts -cpp -odir ../bin -c -java SBP.lhs
+	cd src; $(ghc) -fglasgow-exts -cpp -odir ../bin -java Main.lhs
+
+go: bin/Main.class edu.berkeley.sbp.jar
+	java -cp bin:$(ghclibs):edu.berkeley.sbp.jar Main
\ No newline at end of file