X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=44c04edecd11d5c20461ec1c49aae67b7e470251;hb=712a982fd4d9bad19c8e4ba7cd5ce5a6b4f8e954;hp=126400eada8b1a495f696faca1f7fbfa1c1bb0b4;hpb=67fe852eb2e9b3a489b62cbf9259b5a868db5468;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 126400e..44c04ed 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -18,18 +18,15 @@ else
 SUBDIRS=
 endif
 
-HC = $(GHC)
-
 #-----------------------------------------------------------------------------
 # 	Setting the standard variables
 #
 
+HC 	   = $(GHC_INPLACE)
+MKDEPENDHS = $(GHC_INPLACE)
+
 LIBRARY = libHS$(_way).a
-HS_SRCS = $(wildcard *.lhs)
-HS_OBJS = $(HS_SRCS:.lhs=.$(way_)o)
 LIBOBJS = $(HS_OBJS)
-HS_IFACES= $(HS_SRCS:.lhs=.$(way_)hi) PrelGHC.$(way_)hi
-
 
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
@@ -84,20 +81,24 @@ PrelGHC.$(way_)hi	: PrelGHC.hi-boot
 boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
 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
-SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHScbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
-
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSprel.def DllVersionInfo.o
+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
 
-# PrelMain.dll_o isn't to be included in the final .a
+# PrelMain.dll_o isn't to be included in the final .a, 
+# but it needs to be generated
 ifeq "$(way)" "dll"
-all :: PrelMain.dll_o
+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
@@ -108,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
@@ -138,6 +142,6 @@ INSTALL_PROGS += $(DLL_NAME)
 INSTALL_LIBS  += $(patsubst %.a, %_imp.a, $(LIBRARY)) PrelMain.dll_o
 INSTALL_DATAS += dLL_ifs.hi
 endif
-INSTALL_DATAS += $(HS_IFACES)
+INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi
 
 include $(TOP)/mk/target.mk