X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FMakefile;h=abcb6b89eadde4819a2d7ad2b97dadc66b2b60df;hb=533633e478b67f13e1cfca21a19eef41c672c3f2;hp=27eeb213e1cab4c929c9f902d6e4789db594fad6;hpb=8146101659e5c24adee02c0a732b5096405f717d;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 27eeb21..abcb6b8 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.51 2001/07/03 16:57:03 sewardj Exp $
+# $Id: Makefile,v 1.57 2002/01/24 00:53:18 sof Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -51,7 +51,7 @@ WARNING_OPTS += -Winline
 WARNING_OPTS += -Waggregate-return
 #WARNING_OPTS += -Wpointer-arith
 WARNING_OPTS += -Wbad-function-cast
-#WARNING_OPTS += -Wcast-align
+WARNING_OPTS += -Wcast-align
 #WARNING_OPTS += -Wnested-externs
 #WARNING_OPTS += -Wshadow
 #WARNING_OPTS += -Wcast-qual
@@ -72,6 +72,12 @@ ifeq "$(way)" "mp"
 SRC_HC_OPTS += -I$$PVM_ROOT/include
 endif
 
+
+ifeq "$(way)" "s"
+SRC_HC_OPTS += -DSMP
+SRC_CC_OPTS += -DSMP
+endif
+
 #-----------------------------------------------------------------------------
 # Include the Front panel code?
 
@@ -105,6 +111,7 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 ifeq "$(BootingFromHc)" "YES"
 # use the normal $(CC) when booting from .hc files
 SRC_CC_OPTS += $(HC_OPTS)
+SRC_CC_OPTS += -I../includes -I. -Iparallel -DCOMPILING_RTS
 else
 # otherwise, use $(GHC_INPLACE) as the C compiler.
 CC=$(GHC_INPLACE)
@@ -120,7 +127,7 @@ unexport CC
 #
 #  Building DLLs is only supported on mingw32 at the moment.
 #
-HSLIB             = rts
+PACKAGE             = rts
 
 ifeq "$(DLLized)" "YES"
 SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp
@@ -175,18 +182,21 @@ endif
 
 install :: gmp/libgmp.a
 
+ifeq "$(way)" ""
 clean distclean maintainer-clean ::
-	$(MAKE) -C gmp MAKEFLAGS= $@
+	-$(MAKE) -C gmp MAKEFLAGS= $@
 
-ifeq "$(way)" ""
 INSTALL_LIBS += gmp/libgmp.a
 endif
 
 gmp/libgmp.a ::
 	$(MAKE) -C gmp MAKEFLAGS=
 	@$(CP) gmp/.libs/libgmp.a gmp
+	@$(RANLIB) gmp/libgmp.a
 endif
 
+CLEAN_FILES += gmp/libgmp.a
+
 #-----------------------------------------------------------------------------
 #
 # Building the GUM SysMan