[project @ 2001-03-23 16:36:20 by simonmar]

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

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 0379264..4a7b2c2 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -22,7 +22,7 @@ endif
 #      Setting the standard variables
 #
 
-HC        = $(GHC_INPLACE)
+HC = $(GHC_INPLACE)
 
 ifneq "$(DLLized)" "YES"
 PACKAGE = -package-name std
@@ -36,24 +36,24 @@ HSLIB = std
 # we don't want PrelMain in the GHCi library.
 GHCI_LIBOBJS = $(filter-out PrelMain.$(way_)o,$(HS_OBJS))
 
+BOOT_SRCS += PrelPrimopWrappers.hs
+
+HSC_SRCS = $(wildcard *.hsc)
+HSC_HS   = $(patsubst %.hsc,%.hs, $(HSC_SRCS))
+HS_SRCS := $(HSC_HS) $(filter-out $(HSC_HS),$(HS_SRCS))
+
 #-----------------------------------------------------------------------------
 #      Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fvia-C -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
-ifneq "$(DLLized)" "YES"
-SRC_HC_OPTS += -static
-endif
+SRC_HC_OPTS += -cpp -fvia-C -fglasgow-exts $(GhcLibHcOpts) $(PACKAGE)
 
 ifdef USE_REPORT_PRELUDE
 SRC_HC_OPTS += -DUSE_REPORT_PRELUDE=1
 endif
 
-#
-# Object and interface files have suffixes tagged with their ways
-#
-ifneq "$(way)" ""
-SRC_HC_OPTS += -hisuf $(way_)hi
-endif
+# Special options
+PrelStorable_HC_OPTS = -monly-3-regs
+PrelCError_HC_OPTS = +RTS -K4m -RTS
 
 #-----------------------------------------------------------------------------
 #      Dependency generation
@@ -63,37 +63,36 @@ SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 #-----------------------------------------------------------------------------
 #      Rules
 
+PrelPrimopWrappers.hs: ../../compiler/prelude/primops.txt
+       rm -f PrelPrimopWrappers.hs
+       ../../utils/genprimopcode/genprimopcode  --make-haskell-wrappers \
+               < ../../compiler/prelude/primops.txt > PrelPrimopWrappers.hs
+
 PrelGHC.$(way_)hi      : PrelGHC.hi-boot
        cp $< $@
 
 boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
+ifneq "$(BootingFromHc)" "YES"
+boot :: PrelPrimopWrappers.hs
+all  :: PrelPrimopWrappers.hs
+endif
+
 DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
 
 ifeq "$(DLLized)" "YES"
-HS_SRCS := $(filter-out PrelMain.lhs PrelHugs.lhs, $(HS_SRCS))
-endif
-
+HS_SRCS := $(filter-out PrelMain.lhs, $(HS_SRCS))
 # PrelMain.dll_o isn't to be included in the final .a, 
 # but it needs to be generated
-ifeq "$(DLLized)" "YES"
 all :: PrelMain.dll_o
 endif
 
 CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
-#
-# If we're building the unregisterised way, it may well be for Hugs.
-# In that case, remember to bind the cbits objects into a single file
-# which hugs can load as an auxiliary object file when loading the Prelude.
-#
-ifeq "$(way)" "u"
-all :: libHSstd_cbits.u_o
-CLEAN_FILES += libHSstd_cbits.u_o
-libHSstd_cbits.u_o:
-       $(RM) libHSstd_cbits.u_o
-       ld -r -o libHSstd_cbits.u_o cbits/*.o
-endif
+CLEAN_FILES +=  \
+       $(patsubst %.hsc, %.hs, $(HSC_SRCS)) \
+       $(patsubst %.hsc, %.hs.c, $(HSC_SRCS)) \
+       $(patsubst %.hsc, %.hs.h, $(HSC_SRCS))
 
 #-----------------------------------------------------------------------------
 #      Installation; need to install .hi files as well as libraries
@@ -114,8 +113,5 @@ INSTALL_LIBS  += PrelMain.dll_o
 endif
 
 INSTALL_DATAS += PrelGHC.$(way_)hi
-ifeq "$(DLLized)" "YES"
-INSTALL_DATAS := $(filter-out PrelHugs.$(way_)hi,$(INSTALL_DATAS))
-endif
 
 include $(TOP)/mk/target.mk