[project @ 2000-12-31 16:58:05 by panne]

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

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 4ff8d8c..d9a5db5 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.38 2000/11/01 11:41:47 simonmar Exp $
+# $Id: Makefile,v 1.42 2000/12/31 16:58:05 panne Exp $
 #
 #  This is the Makefile for the runtime-system stuff.
 #  This stuff is written in C (and cannot be written in Haskell).
@@ -26,7 +26,7 @@ SRCS_RTS_C  = $(wildcard *.c) $(wildcard hooks/*.c) $(filter-out parallel/SysMan
 SRCS_RTS_S  = $(wildcard *.S)
 SRCS_RTS_HC = $(wildcard *.hc) $(wildcard parallel/*.hc)
 
-ifneq "$(way)" "dll"
+ifneq "$(DLLized)" "YES"
 SRCS_RTS_C  := $(filter-out RtsDllMain.c, $(SRCS_RTS_C))
 else
 SRCS_RTS_C  := $(filter-out Main.c, $(SRCS_RTS_C))
@@ -35,7 +35,6 @@ endif
 #-----------------------------------------------------------------------------
 # creating and installing libHSrts.a (in its many flavors)
 #
-LIBRARY = libHSrts$(_way).a
 LIBOBJS = $(patsubst %.c,%.$(way_)o,$(SRCS_RTS_C)) \
           $(patsubst %.hc,%.$(way_)o,$(SRCS_RTS_HC)) \
           $(patsubst %.S,%.$(way_)o,$(SRCS_RTS_S))
@@ -63,7 +62,12 @@ WARNING_OPTS += -optc-Wbad-function-cast
 SRC_HC_OPTS += -I../includes -I. -Iparallel $(WARNING_OPTS) $(GhcRtsHcOpts) -optc-DCOMPILING_RTS
 SRC_CC_OPTS = $(GhcRtsCcOpts)
 
-ifneq "$(way)" "dll"
+ifeq "$(GhcWithInterpreter)" "YES"
+SRC_HC_OPTS += -optc-DGHCI
+SRC_CC_OPTS += -DGHCI
+endif
+
+ifneq "$(DLLized)" "YES"
 SRC_HC_OPTS += -static
 endif
 # SRC_HC_OPTS += -optc-fPIC
@@ -75,17 +79,15 @@ endif
 #-----------------------------------------------------------------------------
 # Include the Front panel code?
 
+SRCS_RTS_C :=  $(filter-out Vis%.c, $(SRCS_RTS_C))
+
 # we need GTK+ for the front panel
 ifneq "$(GTK_CONFIG)" ""
-
 ifeq "$(GhcRtsWithFrontPanel)" "YES"
-SRC_HC_OPTS += `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL
-else
-SRCS_RTS_C :=  $(filter-out Vis*.c, $(SRCS_RTS_C))
-endif
-
-VisCallbacks_CC_OPTS = -optc-Wno-unused
-
+SRC_HC_OPTS            += `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL
+SRCS_RTS_C             := $(SRCS_RTS_C) $(wildcard Vis*.c)
+VisCallbacks_CC_OPTS   += -optc-Wno-unused
+endif # GhcRtsWithFrontPanel
 endif # GTK_CONFIG
 
 #-----------------------------------------------------------------------------
@@ -112,15 +114,15 @@ unexport CC
 # -----------------------------------------------------------------------------
 #
 #  Building DLLs is only supported on mingw32 at the moment.
-# 
-DLL_NAME          = HSrts.dll
-ifeq "$(way)" "dll"
-DLL_IMPLIB_NAME   = libHSrts_imp.a
+#
+HSLIB             = rts
 
-SRC_BLD_DLL_OPTS += --output-def=HSrts.def --export-all -L. -Lgmp -lwinmm \
-                    -lHS_imp_stub -lgmp_imp
+ifeq "$(DLLized)" "YES"
+SRC_BLD_DLL_OPTS += -lHS_imp_stub -lgmp_imp
+
+# It's not included in the DLL, but we need to compile it up separately.
+all :: Main.dll_o
 
-#
 # Need an import library containing the symbols the RTS uses from the Prelude.
 # So, to avoid bootstrapping trouble, we build one containing just the syms
 # we need. Weirdly named to avoid clashing later on when compiling the contents
@@ -129,14 +131,11 @@ 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_PEN)/$(DLL_NAME) :: libHS_imp_stub.a
+$(DLL_PEN)/HSrts$(_way).dll :: libHS_imp_stub.a
 
 libHS_imp_stub.a :
        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
-
 endif
 
 # -----------------------------------------------------------------------------
@@ -153,7 +152,7 @@ boot ::
 
 all :: gmp/libgmp.a
 
-ifeq "$(way)" "dll"
+ifeq "$(DLLized)" "YES"
 all :: $(DLL_PEN)/gmp.dll
 
 $(DLL_PEN)/gmp.dll:
@@ -204,13 +203,10 @@ endif
 # Just libHSrts is installed uniformly across ways
 #
 INSTALL_LIBS += $(LIBRARY)
-ifeq "$(EnableWin32DLLs)" "YES"
+ifeq "$(DLLized)" "YES"
 INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll
-ifneq "$(way)" "dll"
-INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBARY))
-endif
+INSTALL_LIBS += $(patsubst %.a,%_imp.a,$(LIBARY))
 INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o
 endif
 
 include $(TOP)/mk/target.mk
-