[project @ 1999-05-05 10:48:03 by sof]

DLL config added

diff --git a/ghc/lib/concurrent/Makefile b/ghc/lib/concurrent/Makefile
index e492a34..46d0b57 100644 (file)
--- a/ghc/lib/concurrent/Makefile
+++ b/ghc/lib/concurrent/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.5 1998/05/05 12:53:29 sof Exp $
+# $Id: Makefile,v 1.6 1999/05/05 10:48:06 sof Exp $
 #
 # Makefile for concurrent libraries.
 #
@@ -44,6 +44,11 @@ Parallel_HC_OPTS  += -fglasgow-exts
 
 SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
+DLL_NAME = HSconc.dll
+DLL_IMPLIB_NAME = libHSconcurrent_imp.a
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSconc.def
+SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHS_cbits_imp -lHS_imp -lgmp -L. -L../../rts/gmp -L../../rts -L../std -L../std/cbits
+
 #-----------------------------------------------------------------------------
 #      Installation; need to install .hi files as well as libraries
 #

diff --git a/ghc/lib/exts/Makefile b/ghc/lib/exts/Makefile
index bd68fbb..c2d309c 100644 (file)
--- a/ghc/lib/exts/Makefile
+++ b/ghc/lib/exts/Makefile
@@ -27,6 +27,10 @@ HS_IFACES= $(HS_SRCS:.lhs=.$(way_)hi)
 
 SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
 
+ifneq "$(way)" "dll"
+SRC_HC_OPTS += -static
+endif
+
 #
 # Profiling options
 WAY_p_HC_OPTS += -GPrelude
@@ -53,6 +57,14 @@ MAGIC_HSCPP_OPTS=-DBEGIN_FOR_GHC='-}' -DEND_FOR_GHC='{-' -DBEGIN_FOR_HUGS='{-' -
 SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR) -optdep--include-prelude -optdep-w $(MAGIC_HSCPP_OPTS)
 
 #-----------------------------------------------------------------------------
+#      Win32 DLL setup
+
+DLL_NAME = HSexts.dll
+DLL_IMPLIB_NAME = libHSexts_imp.a
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSexts.def
+SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHS_cbits_imp -lHS_imp -lgmp -L. -L../../rts/gmp -L../../rts -L../std -L../std/cbits
+
+#-----------------------------------------------------------------------------
 #      Installation; need to install .hi files as well as libraries
 #
 # The interface files are put inside the $(libdir), since they

diff --git a/ghc/lib/misc/Makefile b/ghc/lib/misc/Makefile
index 64768bd..527091d 100644 (file)
--- a/ghc/lib/misc/Makefile
+++ b/ghc/lib/misc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.12 1999/05/05 10:36:30 sof Exp $
+# $Id: Makefile,v 1.13 1999/05/05 10:48:06 sof Exp $
 #
 # Makefile for miscellaneous libraries.
 #
@@ -33,7 +33,6 @@ LIBOBJS = $(HS_OBJS)
 HS_IFACES= $(HS_SRCS:.lhs=.$(way_)hi)
 SRC_MKDEPENDHS_OPTS += -optdep--include-prelude
 
-
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
 
@@ -52,6 +51,10 @@ ifneq "$(way)" ""
 SRC_HC_OPTS += -hisuf $(way_)hi
 endif
 
+ifneq "$(way)" "dll"
+SRC_HC_OPTS += -static
+endif
+
 #
 # Specific flags
 #

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 83163ea..d5ba726 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -32,7 +32,10 @@ HS_IFACES= $(HS_SRCS:.lhs=.$(way_)hi) PrelGHC.$(way_)hi
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
+SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts) -fcompiling-prelude
+ifneq "$(way)" "dll"
+SRC_HC_OPTS += -static
+endif
 
 #
 # Profiling options
@@ -80,6 +83,17 @@ PrelGHC.$(way_)hi    : PrelGHC.hi-boot
 
 boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
+DLL_NAME = HSprel.dll
+DLL_IMPLIB_NAME = libHS_imp.a
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSprel.def
+SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHS_cbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
+
+
+ifeq "$(way)" "dll"
+HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
+endif
+
+
 #-----------------------------------------------------------------------------
 #      Installation; need to install .hi files as well as libraries
 #