[project @ 2000-08-25 10:06:37 by qrczak]

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

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 857db0b..b0ce195 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.29 2000/07/17 15:10:14 rrt Exp $
+# $Id: Makefile,v 1.35 2000/08/25 10:06:37 qrczak Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -111,7 +111,7 @@ SRC_BLD_DLL_OPTS += --output-def=HSrts.def --export-all -L. -Lgmp -lwinmm \
 # Note: if you do change the name of the Prelude DLL, the "--dllname <nm>.dll"
 # below will need to be updated as well.
 
-$(DLL_NAME) :: libHS_imp_stub.a
+$(DLL_PEN)/$(DLL_NAME) :: libHS_imp_stub.a
 
 libHS_imp_stub.a :
        dlltool --output-lib libHS_imp_stub.a --def HSprel.def --dllname HSstd.dll
@@ -129,19 +129,20 @@ endif
 
 ifneq "$(HaveLibGmp)" "YES"
 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;
-       cd gmp && ./configure --target=$(HOSTPLATFORM)
+       cd gmp && ./configure --enable-shared=no
+
+# DON'T KNOW IF WE NEED SOMETHING LIKE THIS ANYMORE:  --SDM
+#      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
+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
@@ -155,6 +156,7 @@ endif
 
 gmp/libgmp.a ::
        $(MAKE) -C gmp MAKEFLAGS=
+       @$(CP) gmp/.libs/libgmp.a gmp
 endif
 
 #-----------------------------------------------------------------------------