[project @ 2000-03-22 12:01:57 by rrt]

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

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index ac33ac7..44c04ed 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -18,12 +18,13 @@ else
 SUBDIRS=
 endif
 
-HC = $(GHC)
-
 #-----------------------------------------------------------------------------
 #      Setting the standard variables
 #
 
+HC        = $(GHC_INPLACE)
+MKDEPENDHS = $(GHC_INPLACE)
+
 LIBRARY = libHS$(_way).a
 LIBOBJS = $(HS_OBJS)
 
@@ -83,7 +84,7 @@ DLL_NAME = HSprel.dll
 DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
 DLL_IMPLIB_NAME = libHS_imp.a
 SRC_BLD_DLL_OPTS += --export-all --output-def=HSprel.def DllVersionInfo.o
-SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHScbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
+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))
@@ -96,6 +97,8 @@ all :: PrelMain.dll_o DllVersionInfo.o
 
 endif
 
+CLEAN_FILES += PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
+
 #
 # Building PrelMain.dll_o is, unfortunately, somewhat tricky
 # with the current DLL setup. PrelMain.dll_o should refer to
@@ -106,12 +109,15 @@ endif
 # 
 # So, we copy out PrelMain.lhs to ".." and build it there &
 # copy the gen'ed object file back in again.
+#
+# Note the patsubst hack (see fptools/mk/target.mk and search for
+# odir for details)
 # 
 ifeq "$(way)" "dll"
 PrelMain.dll_o : PrelMain.lhs
        $(RM) ../PrelMain.lhs
        $(CP) PrelMain.lhs ../
-       $(MAKE) -C .. PrelMain.dll_o way=dll HC_OPTS="$(filter-out -fcompiling-prelude, $(HC_OPTS))"
+       $(MAKE) -C .. PrelMain.dll_o way=dll HC=std/$(GHC_INPLACE) HC_OPTS="$(filter-out -fcompiling-prelude -split-objs, $(patsubst -odir,,$(HC_OPTS)))"
        $(MV) ../PrelMain.dll_o .
        $(RM) ../PrelMain.lhs ../PrelMain.dll_hi
 endif