X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=35322ae21d16168f60511ff1137f68011a8882a3;hb=b222b0e833b8983767d19ea152d370c4b973bc3b;hp=22644b0f0b0bf7d2a259fc287036fb29ad831c12;hpb=214fe5a15ab09fd7ae5ee48c99d6acf18a17b749;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 22644b0..35322ae 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,6 +1,6 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.14 1999/10/08 14:16:15 simonmar Exp $
-
+# $Id: Makefile,v 1.18 2000/03/14 01:30:21 sof Exp $
+#
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
 #
@@ -21,9 +21,9 @@ include $(TOP)/mk/boilerplate.mk
 
 WAYS=$(GhcLibWays)
 
-SRCS_RTS_C  = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out gum/SysMan.c,$(wildcard gum/*.c))
+SRCS_RTS_C  = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out parallel/SysMan.c,$(wildcard parallel/*.c))
 SRCS_RTS_S  = $(wildcard *.S)
-SRCS_RTS_HC = $(wildcard *.hc)
+SRCS_RTS_HC = $(wildcard *.hc) $(wildcard parallel/*.hc)
 
 ifneq "$(way)" "dll"
 SRCS_RTS_C  := $(filter-out RtsDllMain.c, $(SRCS_RTS_C))
@@ -59,7 +59,7 @@ WARNING_OPTS += -optc-Wbad-function-cast
 #WARNING_OPTS += -optc-Wredundant-decls 
 #WARNING_OPTS += -optc-Wconversion
 
-SRC_HC_OPTS += -I../includes -I. -Igum $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS
+SRC_HC_OPTS += -I../includes -I. -Iparallel $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS
 SRC_CC_OPTS = $(GhcRtsCcOpts)
 
 ifneq "$(way)" "dll"
@@ -84,8 +84,8 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 # ../driver/ghc (a better C compiler :-) to compile the
 # different RTS pieces
 #
-CC=$(GHC) $(HC_OPTS) $($*_HC_OPTS)
-HC=$(GHC)
+CC=$(GHC_INPLACE) $(HC_OPTS) $($*_HC_OPTS)
+HC=$(GHC_INPLACE)
 
 # prevent this value from leaking into the GMP makefile
 unexport CC
@@ -94,8 +94,8 @@ unexport CC
 #
 #  Building DLLs is only supported on mingw32 at the moment.
 # 
-ifeq "$(way)" "dll"
 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
 
@@ -126,7 +126,9 @@ endif
 
 ifneq "$(HaveLibGmp)" "YES"
 boot ::
-	cd gmp && ./configure
+	if [ ! -f gmp/configure ] ; then ( cd gmp && echo ${SED} && autoconf SED= ); fi;
+	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
 
@@ -149,7 +151,7 @@ endif
 #
 
 ifeq "$(way)" "mp"
-all :: gum/SysMan
+all :: parallel/SysMan
 
 ifdef solaris2_TARGET_OS
 __socket_libs = -lsocket -lnsl
@@ -157,12 +159,12 @@ else
 __socket_libs =
 endif
 
-gum/SysMan : gum/SysMan.mp_o gum/LLComms.mp_o 
+parallel/SysMan : parallel/SysMan.mp_o parallel/LLComms.mp_o RtsUtils.mp_o RtsFlags.mp_o
 	$(RM) $@
-	gcc -o $@ gum/SysMan.mp_o gum/LLComms.mp_o -L$$PVM_ROOT/lib/$$PVM_ARCH -lgpvm3 -lpvm3 $(__socket_libs)
+	gcc -o $@ parallel/SysMan.mp_o parallel/LLComms.mp_o -L$$PVM_ROOT/lib/$$PVM_ARCH -lgpvm3 -lpvm3 $(__socket_libs)
 
-CLEAN_FILES  += gum/SysMan.mp_o gum/SysMan
-INSTALL_LIBEXECS += gum/SysMan
+CLEAN_FILES  += parallel/SysMan.mp_o parallel/SysMan
+INSTALL_LIBEXECS += parallel/SysMan
 endif
 
 #-----------------------------------------------------------------------------
@@ -175,7 +177,7 @@ INSTALL_LIBS += $(LIBRARY)
 ifeq "$(EnableWin32DLLs)" "YES"
 INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll
 INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY))
-INSTALL_LIBS += gmp/libgmp_imp.a Main.o
+INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o
 endif
 
 include $(TOP)/mk/target.mk