[project @ 1999-12-07 15:52:40 by simonmar]

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

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index e244d19..920d8ee 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.11 1999/06/29 14:15:32 simonmar Exp $
+# $Id: Makefile,v 1.16 1999/12/07 15:52:40 simonmar Exp $
 
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -25,6 +25,12 @@ SRCS_RTS_C  = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out gum/SysMan.c,$(
 SRCS_RTS_S  = $(wildcard *.S)
 SRCS_RTS_HC = $(wildcard *.hc)
 
+ifneq "$(way)" "dll"
+SRCS_RTS_C  := $(filter-out RtsDllMain.c, $(SRCS_RTS_C))
+else
+SRCS_RTS_C  := $(filter-out Main.c, $(SRCS_RTS_C))
+endif
+
 #-----------------------------------------------------------------------------
 # creating and installing libHSrts.a (in its many flavors)
 #
@@ -57,7 +63,7 @@ SRC_HC_OPTS += -I../includes -I. -Igum $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCO
 SRC_CC_OPTS = $(GhcRtsCcOpts)
 
 ifneq "$(way)" "dll"
-# SRC_HC_OPTS += -static
+SRC_HC_OPTS += -static
 endif
 # SRC_HC_OPTS += -optc-fPIC
 
@@ -78,7 +84,8 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 # ../driver/ghc (a better C compiler :-) to compile the
 # different RTS pieces
 #
-CC=$(HC) $(HC_OPTS) $($*_HC_OPTS)
+CC=$(GHC_INPLACE) $(HC_OPTS) $($*_HC_OPTS)
+HC=$(GHC_INPLACE)
 
 # prevent this value from leaking into the GMP makefile
 unexport CC
@@ -87,8 +94,9 @@ unexport CC
 #
 #  Building DLLs is only supported on mingw32 at the moment.
 # 
-ifeq "$(way)" "dll"
 DLL_NAME          = HSrts.dll
+ifeq "$(way)" "dll"
+DLL_IMPLIB_NAME   = libHSrts_imp.a
 SRC_BLD_DLL_OPTS += --def HSrts.def -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp
 
 #
@@ -164,6 +172,11 @@ endif
 # Just libHSrts is installed uniformly across ways
 #
 INSTALL_LIBS += $(LIBRARY)
+ifeq "$(EnableWin32DLLs)" "YES"
+INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll
+INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY))
+INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o
+endif
 
 include $(TOP)/mk/target.mk