X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FMakefile;h=08e1696c6c4dfcc9637170c829d769638d36b6ff;hb=efcd3f2b7aabe23e30ab482db1ed2eee5075e095;hp=96400f9bc5d6af01e1298ce9771fae0d3d918aba;hpb=b70b5550a9c2825bbca73e00c2cd249f85df8521;p=ghc-hetmet.git

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 96400f9..08e1696 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -25,7 +25,14 @@ endif
 HC 	   = $(GHC_INPLACE)
 MKDEPENDHS = $(GHC_INPLACE)
 
-LIBRARY = libHS$(_way).a
+ifneq "$(way)" "dll"
+PACKAGE = -package-name std
+else
+# Hack by SPJ to delay if-then-else until the pattern rule when we have $*
+PACKAGE = $(subst ~, ,$(word $(words dummy $(findstring $(notdir $*), PrelMain )), -package-name~std))
+endif
+LIBRARY = libHSstd$(_way).a
+
 LIBOBJS = $(HS_OBJS)
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 LIBOBJS = $(filter-out PrelHugs.$(way_)o,$(HS_OBJS))
@@ -34,7 +41,7 @@ endif
 #-----------------------------------------------------------------------------
 # 	Setting the GHC compile options
 
-SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts)
+SRC_HC_OPTS += -recomp -cpp -fglasgow-exts -fvia-C -Rghc-timing $(GhcLibHcOpts) $(PACKAGE)
 ifneq "$(way)" "dll"
 SRC_HC_OPTS += -static
 endif
@@ -80,11 +87,11 @@ PrelGHC.$(way_)hi	: PrelGHC.hi-boot
 
 boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
-DLL_NAME = HSprel.dll
+DLL_NAME = HSstd.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 -lHS_cbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
+DLL_IMPLIB_NAME = libHSstd_imp.a
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSstd.def DllVersionInfo.o
+SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHSstd_cbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
 
 ifeq "$(way)" "dll"
 HS_SRCS := $(filter-out PrelMain.lhs PrelHugs.lhs, $(HS_SRCS))
@@ -100,38 +107,16 @@ 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
-# all its imports bar Main.main_closure as residing in DLLs.
-# But, since the .hi's of PrelBase et al. is in the same
-# directory as PrelMain, the compiler will assume that they
-# reside in the same DLL as PrelMain & generate code accordingly.
-# 
-# So, we copy out PrelMain.lhs to ".." and build it there &
-# copy the gen'ed object file back in again.
-# 
-ifeq "$(way)" "dll"
-SplitObjs = NO
-PrelMain.dll_o : PrelMain.lhs
-	$(RM) ../PrelMain.lhs
-	$(CP) PrelMain.lhs ../
-	$(MAKE) -C .. PrelMain.dll_o way=dll HC=std/$(GHC_INPLACE) HC_OPTS="$(filter-out -fcompiling-prelude, $(HC_OPTS))"
-	$(MV) ../PrelMain.dll_o .
-	$(RM) ../PrelMain.lhs ../PrelMain.dll_hi
-endif
-
-
-#
 # 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 :: libHS_cbits.u_o
-CLEAN_FILES += libHS_cbits.u_o
-libHS_cbits.u_o:
-	$(RM) libHS_cbits.u_o
-	ld -r -o libHS_cbits.u_o cbits/*.o
+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
 
 #-----------------------------------------------------------------------------
@@ -149,11 +134,15 @@ override datadir:=$(libdir)/imports/std
 # Files to install from here
 # 
 INSTALL_LIBS  += $(LIBRARY)
-ifeq "$(EnableWin32DLLs)" "YES"
+ifeq "$(way)" "dll"
 INSTALL_PROGS += $(DLL_NAME)
-INSTALL_LIBS  += $(patsubst %.a, %_imp.a, $(LIBRARY)) PrelMain.dll_o
-INSTALL_DATAS += dLL_ifs.hi
+INSTALL_LIBS  += PrelMain.dll_o
+else
+INSTALL_LIBS  += $(patsubst %.a,%_imp.a, $(LIBRARY))
 endif
 INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi
+ifeq "$(way)" "dll"
+INSTALL_DATAS := $(filter-out PrelHugs.$(way_)hi,$(INSTALL_DATAS))
+endif
 
 include $(TOP)/mk/target.mk