X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=3e86da98ec62cf72e81948b25d3da8c5ca3b321e;hb=3b9019a60acb7bc9da184c8df9fdeecd2bbb7235;hp=276120ae6e2bf3160af812e6f48ca1cb3e60e3b2;hpb=1b79f36c02accc4d401169a1816825c2ac8e42a4;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 276120a..3e86da9 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,16 +1,15 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.19 2000/03/14 01:31:38 sof Exp $
+# $Id: Makefile,v 1.36 2000/09/04 14:39:10 simonmar Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
 #
-#  We create two libraries.  One, libHSrts<tag>.a, is built separately
-#  for each "way".  The other, libHSclib.a is built once: it is just
-#  .lc files that end up the same no matter what, i.e. completely
-#  ordinary C.
-
+#  .c  files are vanilla C,
+#  .hc files are "Haskellized-C", compiled using the C compiler and
+#      (possibly) the assembly-mangler.  The GHC driver script
+#      knows how to compile this stuff.
+#
 #  Other sorta independent, compile-once subdirs are:
-
 #	gmp		-- GNU multi-precision library (for Integer)
 
 #-----------------------------------------------------------------------------
@@ -19,6 +18,8 @@ TOP=..
 DoingRTS=YES
 include $(TOP)/mk/boilerplate.mk
 
+SplitObjs=NO
+
 WAYS=$(GhcLibWays)
 
 SRCS_RTS_C  = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out parallel/SysMan.c,$(wildcard parallel/*.c))
@@ -49,7 +50,7 @@ WARNING_OPTS += -optc-Wmissing-prototypes
 WARNING_OPTS += -optc-Wmissing-declarations
 WARNING_OPTS += -optc-Winline
 WARNING_OPTS += -optc-Waggregate-return
-WARNING_OPTS += -optc-Wpointer-arith
+#WARNING_OPTS += -optc-Wpointer-arith
 WARNING_OPTS += -optc-Wbad-function-cast
 #WARNING_OPTS += -optc-Wcast-align
 #WARNING_OPTS += -optc-Wnested-externs
@@ -97,7 +98,9 @@ unexport CC
 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
+
+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.
@@ -108,10 +111,10 @@ SRC_BLD_DLL_OPTS += --def HSrts.def -lwinmm -lHS_imp_stub -lgmp -L. -Lgmp
 # 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 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
@@ -126,12 +129,22 @@ endif
 
 ifneq "$(HaveLibGmp)" "YES"
 boot ::
-	if [ ! -f gmp/configure ] ; then ( cd gmp && 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 :: $(DLL_PEN)/gmp.dll
+
+$(DLL_PEN)/gmp.dll:
+	make -C gmp gmp.dll
+	$(MV) gmp/gmp.dll $(DLL_PEN)
+endif
+
 install :: gmp/libgmp.a
 
 clean ::
@@ -143,6 +156,7 @@ endif
 
 gmp/libgmp.a ::
 	$(MAKE) -C gmp MAKEFLAGS=
+	@$(CP) gmp/.libs/libgmp.a gmp
 endif
 
 #-----------------------------------------------------------------------------
@@ -176,7 +190,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