[project @ 1999-05-11 17:05:43 by keithw]

[ghc-hetmet.git] / ghc / lib / misc / Makefile

diff --git a/ghc/lib/misc/Makefile b/ghc/lib/misc/Makefile
index 28b60c9..9a5c293 100644 (file)
--- a/ghc/lib/misc/Makefile
+++ b/ghc/lib/misc/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.8 1998/05/19 10:35:32 simonm Exp $
+# $Id: Makefile,v 1.15 1999/05/11 17:05:46 keithw Exp $
 #
 # Makefile for miscellaneous libraries.
 #
@@ -33,14 +33,14 @@ LIBOBJS = $(HS_OBJS)
 HS_IFACES= $(HS_SRCS:.lhs=.$(way_)hi)
 SRC_MKDEPENDHS_OPTS += -optdep--include-prelude
 
-
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
+SRC_HC_OPTS += -i../concurrent -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
 
 #
 # Profiling options
+# (what's this stuff doing here?)
 WAY_p_HC_OPTS += -GPrelude
 WAY_mr_HC_OPTS += -GPrelude
 
@@ -51,17 +51,34 @@ ifneq "$(way)" ""
 SRC_HC_OPTS += -hisuf $(way_)hi
 endif
 
+ifneq "$(way)" "dll"
+SRC_HC_OPTS += -static
+endif
+
 #
 # Specific flags
 #
-BSD_HC_OPTS        += -syslib posix -optc-DNON_POSIX_SOURCE
-Socket_HC_OPTS     += -I../std/cbits -syslib posix -optc-DNON_POSIX_SOURCE
-SocketPrim_HC_OPTS += -I../std/cbits -H10m -syslib posix -optc-DNON_POSIX_SOURCE
+
+BSD_HC_OPTS          += -I../std/cbits -H8m -optc-DNON_POSIX_SOURCE
+Socket_HC_OPTS       += -I../std/cbits -optc-DNON_POSIX_SOURCE
+SocketPrim_HC_OPTS   += -I../std/cbits -H12m -optc-DNON_POSIX_SOURCE
+PackedString_HC_OPTS += -H12m
+Native_HC_OPTS       += -H8m
+Pretty_HC_OPTS       += -H8m
 
 #-----------------------------------------------------------------------------
 #      Dependency generation
 
-SRC_MKDEPENDHS_OPTS += -syslib posix -I$(GHC_INCLUDE_DIR)
+SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
+
+#-----------------------------------------------------------------------------
+#      Win32 DLL setup
+
+DLL_NAME = HSmisc.dll
+DLL_IMPLIB_NAME = libHSmisc_imp.a
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSmisc.def
+SRC_BLD_DLL_OPTS += -lwinmm -lwsock32 -lHSrts_imp -lHS_cbits_imp -lHSmisc_cbits_imp -lHS_imp -lHSexts_imp -lgmp -L. -L../../rts/gmp -L../../rts -L../std -L../std/cbits -L../exts -Lcbits
+
 
 #-----------------------------------------------------------------------------
 #      Installation; need to install .hi files as well as libraries