X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;fp=Makefile;h=205b410760b7eef5b07506e08500ea9acc929727;hp=25f68025f49bcb41286b3dc3c21dcd108d8e421d;hb=85016412a8eb6bfd0a4bd57a01a966ca9c5302f7;hpb=f83221f37bcf9eaf79d87cce9156f73d2d24985b

diff --git a/Makefile b/Makefile
index 25f6802..205b410 100644
--- a/Makefile
+++ b/Makefile
@@ -139,28 +139,46 @@ upload:
 ##   make runHaskellDemo JAVA_HOME=<java-home>
 ##
 
-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
-link            := -L$(prefix)/lib/ \
+ifeq ($(shell uname),Darwin)
+with_jvmdir = --with-jvmdir=/System/Library/Frameworks/JavaVM.framework/
+jvmlink     = -framework JavaVM -optl -fexceptions
+else
+with_jvmdir = --with-jvmdir=$(JAVA_HOME)
+jvmlink     = -ljava -ljvm -lverify
+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
+link            = -L$(prefix)/lib/ \
                    -L$(JAVA_HOME)/jre/lib/i386/ \
                    -L$(JAVA_HOME)/jre/lib/i386/client/ \
-                   -lstdc++ -lJVMBridge -lJVMInvocation -lHaskellJVMBridge -ljava -ljvm -lverify
-packages        := -package haskell98 -package base -package rts -package concurrent -package lang
-ghc             := ghc -fglasgow-exts $(packages) $(link) -i$(prefix)/imports/
-bin             := $(prefix)/bin/
+                   -lstdc++ -lJVMBridge -lJVMInvocation -lHaskellJVMBridge $(jvmlink)
+packages        = -package haskell98 -package base -package rts -package rts
+ghc             = ghc -fglasgow-exts $(packages) $(link) -i$(prefix)/imports/
+bin             = $(prefix)/bin/
 
 .jvm-bridge:
 	mkdir -p $(prefix)/src
-	cd $(prefix)/src; curl $(jvm-bridge-url) | tar -xvzf -
 
-	cd $(prefix)/src/haskell-jvm-bridge-*/Native; ./configure --prefix=$(prefix) --with-jvmdir=$(JAVA_HOME)
-	cd $(prefix)/src/haskell-jvm-bridge-*/Native; make
-	cd $(prefix)/src/haskell-jvm-bridge-*/Native; make install
+	cd $(prefix)/src; \
+		curl $(jvm-bridge-url) | tar -xvzf -
 
-	cd $(prefix)/src/haskell-jvm-bridge-*/Haskell; ./configure --prefix=$(prefix) --with-jvmdir=$(JAVA_HOME)
-	cd $(prefix)/src/haskell-jvm-bridge-*/Haskell; make
-	cd $(prefix)/src/haskell-jvm-bridge-*/Haskell; make install
+	cd $(prefix)/src/haskell-jvm-bridge-*; \
+		patch -p0 < $(shell pwd)/misc/jvm-bridge.patch && \
+		patch -p0 < $(shell pwd)/misc/jvm-bridge.intelmac2.patch && \
+		(cd Native; autoreconf; true) && \
+		(cd Haskell; autoreconf; true)
+
+	cd $(prefix)/src/haskell-jvm-bridge-*/Native; \
+		./configure --prefix=$(prefix) $(with_jvmdir) && \
+		make && \
+		make install
+
+	cd $(prefix)/src/haskell-jvm-bridge-*/Haskell; \
+		./configure --prefix=$(prefix) $(with_jvmdir) && \
+		make && \
+		make install
 
 	touch $@
 
@@ -189,4 +207,5 @@ bin/HaskellDemo: src/HaskellDemo.hs \
 		bin/Class_edu_berkeley_sbp_Tree.o \
 		bin/JVM_edu_berkeley_sbp_misc_HaskellHelper.o
 	cd bin; $(ghc) -c ../src/HaskellDemo.hs -o HaskellDemo.o
+	cd bin; for A in *.hs; do $(ghc) -c $$A; done
 	cd bin; $(ghc) -o HaskellDemo *.o