[project @ 2000-07-31 10:12:19 by simonmar]

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

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 89e031a..9dbf2be 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.28 2000/06/23 14:01:09 rrt Exp $
+# $Id: Makefile,v 1.31 2000/07/31 10:12:19 simonmar Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -99,8 +99,8 @@ DLL_NAME          = HSrts.dll
 ifeq "$(way)" "dll"
 DLL_IMPLIB_NAME   = libHSrts_imp.a
 
-SRC_BLD_DLL_OPTS += --output-def=HSrts.def --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.
@@ -135,13 +135,17 @@ boot ::
        cd gmp && ./configure --target=$(HOSTPLATFORM)
 # Slight cheatage here to past host as target, but x-compilation isn't supported by ghc.
 
+# make sure the various configure files are included in a source dist.
+SRC_DIST_FILES += gmp/configure gmp/mpn/configure gmp/mpz/configure
+
 all :: gmp/libgmp.a
 
 ifeq "$(way)" "dll"
-all :: gmp/gmp.dll
+all :: $(DLL_PEN)/gmp.dll
 
-gmp/gmp.dll:
+$(DLL_PEN)/gmp.dll:
        make -C gmp gmp.dll
+       mv gmp/gmp.dll $(DLL_PEN)
 endif
 
 install :: gmp/libgmp.a