X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=43d6717d789c21bd280cc17d2972ea32dbb5e0fe;hp=06262e02a822a7425d5fdee12120ff026f7f8926;hb=eee310fc34d114be6b366f1a94fe6fe49da8b99b;hpb=4aadad134578c7f1f450f426c3717bc20adcd8ea

diff --git a/Makefile b/Makefile
index 06262e0..43d6717 100644
--- a/Makefile
+++ b/Makefile
@@ -139,54 +139,74 @@ 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/ \
-                   -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/
+include Makefile.haskell
 
 .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/broken-cygwin-detection-patch && \
+		$(patchmac) \
+		$(patchghc) \
+		(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 $@
 
-runHaskellDemo:
+runHaskellDemo: .jvm-bridge
 	mkdir -p bin
 	make bin/HaskellDemo
-	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/usr/lib/:$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/client bin/HaskellDemo
+	bin/HaskellDemo
 
-bin/Header_%.o: edu.berkeley.sbp.jar
+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
+	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
+	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
+	cd bin; $(ghc) -c JVM_$*.hs $(link)
 
 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 -o HaskellDemo.o
-	cd bin; $(ghc) -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
+
+
+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