[project @ 2000-07-17 15:10:14 by rrt]

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

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 3e08742..857db0b 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.23 2000/04/28 17:16:10 rrt Exp $
+# $Id: Makefile,v 1.29 2000/07/17 15:10:14 rrt Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -98,7 +98,9 @@ unexport CC
 DLL_NAME          = HSrts.dll
 ifeq "$(way)" "dll"
 DLL_IMPLIB_NAME   = libHSrts_imp.a
-SRC_BLD_DLL_OPTS += --export-all -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp
+
+SRC_BLD_DLL_OPTS += --output-def=HSrts.def --export-all -L. -Lgmp -lwinmm \
+                    -lHS_imp_stub -lgmp_imp
 
 #
 # Need an import library containing the symbols the RTS uses from the Prelude.
@@ -130,12 +132,18 @@ boot ::
        if [ ! -f gmp/configure ] ; then ( cd gmp && autoconf ); fi;
        if [ ! -f gmp/mpn/configure ] ; then ( cd gmp/mpn && autoconf ); fi;
        if [ ! -f gmp/mpz/configure ] ; then ( cd gmp/mpz && autoconf ); fi;
-       if [ ! -f gmp/mpz/tests/configure ] ; then ( cd gmp/mpz/tests && autoconf ); fi;
        cd gmp && ./configure --target=$(HOSTPLATFORM)
 # Slight cheatage here to past host as target, but x-compilation isn't supported by ghc.
 
 all :: gmp/libgmp.a
 
+ifeq "$(way)" "dll"
+all :: gmp/gmp.dll
+
+gmp/gmp.dll:
+       make -C gmp gmp.dll
+endif
+
 install :: gmp/libgmp.a
 
 clean ::
@@ -180,7 +188,9 @@ endif
 INSTALL_LIBS += $(LIBRARY)
 ifeq "$(EnableWin32DLLs)" "YES"
 INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll
-INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY))
+ifneq "$(way)" "dll"
+INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBARY))
+endif
 INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o
 endif