From cb94732655a610c82a2ab09d506eb38d0be88ce5 Mon Sep 17 00:00:00 2001
From: adam <adam@megacz.com>
Date: Mon, 4 Sep 2006 05:47:59 -0400
Subject: [PATCH] factor out Makefile.haskell

darcs-hash:20060904094759-5007d-147dd39a2c0ea1216c25a6449b8edcf0bdbed124.gz
---
 Makefile         |   32 +-------------------------------
 Makefile.haskell |   31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 Makefile.haskell

diff --git a/Makefile b/Makefile
index 3a9e7b5..2a1e2f2 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
diff --git a/Makefile.haskell b/Makefile.haskell
new file mode 100644
index 0000000..29c2c2a
--- /dev/null
+++ b/Makefile.haskell
@@ -0,0 +1,31 @@
+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/
-- 
1.7.10.4