totally hid all the ugly JVM stuff, created a pretty ADT

[sbp.git] / Makefile

diff --git a/Makefile b/Makefile
index 2ee8bb8..3a9e7b5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -152,11 +152,13 @@ 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
@@ -164,10 +166,7 @@ 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)
+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/
@@ -216,11 +215,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