[project @ 1998-01-26 17:10:48 by simonm]

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

diff --git a/ghc/lib/Makefile b/ghc/lib/Makefile
index 4d0fcf8..133fcde 100644 (file)
--- a/ghc/lib/Makefile
+++ b/ghc/lib/Makefile
@@ -10,11 +10,10 @@
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
 
+WAYS=$(GhcLibWays)
+
 ifeq "$(way)" ""
 SUBDIRS = cbits
-ifeq ($(IncludeTestDirsInBuild),YES)
-  SUBDIRS += tests
-endif
 else
 SUBDIRS=
 endif
@@ -31,6 +30,7 @@ HS_OBJS = $(HS_SRCS:.lhs=.$(way_)o)
 LIBOBJS = $(HS_OBJS)
 HS_IFACES= $(HS_SRCS:.lhs=.$(way_)hi) ghc/GHC.$(way_)hi
 
+
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
 
@@ -53,7 +53,7 @@ ghc/ArrBase_HC_OPTS        += -monly-2-regs
 glaExts/PackedString_HC_OPTS += -monly-3-regs
 required/Directory_HC_OPTS   += -monly-3-regs 
 concurrent/Parallel_HC_OPTS  += -fglasgow-exts
-required/Time_HC_OPTS        += -monly-3-regs -H12m
+required/Time_HC_OPTS        += -monly-3-regs -H16m
 
 # Far too much heap is needed to compile PrelNum with -O at the
 # moment, but there you go..
@@ -63,11 +63,18 @@ ghc/PrelNum_HC_OPTS          += -H30m
 # to override the SRC_HC_OPTS of -O, and anything option coming
 # from the Makefile overrides what's in OPTIONS lines. (mumble_HC_OPTS
 # does override SRC_HC_OPTS settings)
-ghc/UnsafeST_HC_OPTS         += -Onot
-
-ghc/PrelBase_HC_OPTS         += -H8m
-ghc/PrelRead_HC_OPTS         += -H8m
-ghc/IOHandle_HC_OPTS         += -H8m
+ghc/Unsafe_HC_OPTS           += -Onot
+
+ghc/PrelBase_HC_OPTS         += -H12m
+ghc/PrelRead_HC_OPTS         += -H12m
+ghc/PrelTup_HC_OPTS          += -H12m
+ghc/ArrBase_HC_OPTS          += -H8m
+ghc/IOHandle_HC_OPTS         += -H12m
+required/Time_HC_OPTS        += -H8m
+required/Complex_HC_OPTS     += -H10m
+required/IO_HC_OPTS         += -H12m
+glaExts/Int_HC_OPTS          += -H8m
+glaExts/Word_HC_OPTS         += -H8m
 
 #-----------------------------------------------------------------------------
 #      Dependency generation
@@ -106,5 +113,3 @@ INSTALL_LIBS  += $(LIBRARY)
 INSTALL_DATAS += $(HS_IFACES)
 
 include $(TOP)/mk/target.mk
-
-