X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=2a1e2f251a573e57db031e5fa3df58d133732dc6;hp=2ee8bb8499464c931d3623d151ddd8dfb48a9825;hb=c042bb0dcce5d64f09b2788b2dfb722145162d2b;hpb=d6c55258bdfa1d46c471773c7f6095a6d1b7c46c

diff --git a/Makefile b/Makefile
index 2ee8bb8..2a1e2f2 100644
--- a/Makefile
+++ b/Makefile
@@ -139,38 +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    =
-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/"
-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            = -L$(prefix)/lib/ \
-                  -L$(JAVA_HOME)/jre/lib/i386/ \
-                  -L$(JAVA_HOME)/jre/lib/i386/client/ \
-                  -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
@@ -216,11 +185,13 @@ bin/JVM_%.o: bin/Class_%.o
 
 edu_berkeley_sbp_misc_HaskellHelper_list = "edu.berkeley.sbp.misc.HaskellHelper\njava.lang.String\nedu.berkeley.sbp.Tree\njava.lang.Object"
 
-bin/HaskellDemo: src/HaskellDemo.hs \
-		bin/Class_java_lang_Object.o \
-		bin/Class_java_lang_String.o \
-		bin/Class_edu_berkeley_sbp_Tree.o \
-		bin/JVM_edu_berkeley_sbp_misc_HaskellHelper.o
-	cd bin; $(ghc) -c ../src/HaskellDemo.hs $(link) -o HaskellDemo.o
+bin/HaskellDemo: src/SBP.hs \
+                 src/HaskellDemo.hs \
+	 	 bin/Class_java_lang_Object.o \
+		 bin/Class_java_lang_String.o \
+		 bin/Class_edu_berkeley_sbp_Tree.o \
+		 bin/JVM_edu_berkeley_sbp_misc_HaskellHelper.o
+	cd bin; $(ghc) -c ../src/SBP.hs $(link) -o SBP.o
+	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