[project @ 2000-05-15 12:53:39 by rrt]

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

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 1180fe5..3deb0bd 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.22 2000/04/17 11:57:55 simonmar Exp $
+# $Id: Makefile,v 1.26 2000/05/15 12:53:39 rrt Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -112,7 +112,7 @@ SRC_BLD_DLL_OPTS += --export-all -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp
 $(DLL_NAME) :: libHS_imp_stub.a
 
 libHS_imp_stub.a :
-       dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSprel.dll
+       dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSstd.dll
 
 # It's not included in the DLL, but we need to compile it up separately.
 all :: Main.dll_o
@@ -136,6 +136,13 @@ boot ::
 
 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 +187,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