[project @ 2001-01-05 15:24:28 by sewardj]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index b83135e..49fb11b 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -114,12 +114,12 @@ ifeq "$(GhcWithHscBuiltViaC)" "YES"
 # need hslibs/lang first if we're bootstrapping
 ProjectsToBuild   = glafp-utils hslibs ghc
 else
-ProjectsToBuild   = glafp-utils ghc hslibs
+ProjectsToBuild   = glafp-utils happy
 endif
 #
 # Make a distinction between building and installing
 #
-ProjectsToInstall = glafp-utils ghc hslibs
+ProjectsToInstall = glafp-utils happy
 
 #
 # Should the various project tests directories be built?
@@ -159,7 +159,7 @@ GhcCompilerWays=
 #
 #      -dcore-lint     check the types after every pass of the compiler;
 #                      a pretty strong internal check
-GhcHcOpts=-O
+GhcHcOpts=-O -Rghc-timing
 
 # GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
 GhcWithHscBuiltViaC=@BootingFromHc@
@@ -175,12 +175,13 @@ else
 GhcWithNativeCodeGen=NO
 endif
 
-# Include GHCi in the compiler
-ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
-GhcWithInterpreter=YES
-else 
+# Include GHCi in the compiler.  Default to NO for the time being.
+
+# ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
+# GhcWithInterpreter=YES
+# else 
 GhcWithInterpreter=NO
-endif
+# endif
 
 #
 # Building various ways?
@@ -214,12 +215,12 @@ endif
 #      -O is pretty desirable, otherwise no inlining of prelude
 #              things (incl "+") happens when compiling with this compiler
 
-GhcLibHcOpts=-O
+GhcLibHcOpts=-O -Rghc-timing
 
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 # Don't split object files for libs if we're building DLLs
-EnableWin32DLLs=@EnableWin32DLLs@
-ifeq "$(EnableWin32DLLs)" "YES"
+DLLized=@EnableWin32DLLs@
+ifeq "$(DLLized)" "YES"
 SplitObjs=NO
 else
 SplitObjs=YES
@@ -246,6 +247,9 @@ StripLibraries=NO
 GhcRtsHcOpts=-O2
 GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer
 
+# Include the front panel code?  Needs GTK+.
+GhcRtsWithFrontPanel = NO
+
 ################################################################################
 #
 #              hslibs project
@@ -261,7 +265,7 @@ GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer
 HsLibsFor      = ghc
 
 # hslibs for GHC also uses the following variables (defined above):
-#   GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, EnableWin32DLLs, StripLibraries
+#   GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, DLLized, StripLibraries
 
 # Haskell compiler options for tools in hslibs
 GhcLibToolsHcOpts=-O
@@ -430,7 +434,7 @@ endif
 ifeq "$(strip $(mandir))" ""
 mandir         = $(prefix)/man
 endif
- 
+
 
 ################################################################################
 #
@@ -494,10 +498,9 @@ HAPPY_PREFIX       = $(FPTOOLS_TOP)/happy/src/
 GREENCARD_PREFIX       = $(FPTOOLS_TOP)/green-card/src/
 
 UNLIT_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/unlit/
-STAT2RESID_PREFIX       = $(FPTOOLS_TOP)/ghc/utils/stat2resid/
 HP2PS_PREFIX            = $(FPTOOLS_TOP)/ghc/utils/hp2ps/
 HSTAGS_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/hstags/
-
+HSC2HS_PREFIX          = $(FPTOOLS_TOP)/ghc/utils/hsc2hs/
 
 #-----------------------------------------------------------------------------
 # Haskell compilers and mkdependHS
@@ -521,7 +524,7 @@ HBC         = @HBC@
 NHC            = @NHC@
 
 HC             = @WithHc@
-MKDEPENDHS     = $(HC)
+MKDEPENDHS     = $(GHC)
 
 # Sometimes we want to invoke ghc from the build tree in different
 # projects (eg. it's handy to have a nofib & a ghc build in the same
@@ -557,6 +560,12 @@ LibGmp             = @LibGmp@
 HaveRegex      = @HaveRegex@
 
 #-----------------------------------------------------------------------------
+# GTK+
+
+GTK_CONFIG             = @GTK_CONFIG@
+GTK_VERSION            = @GTK_VERSION@
+
+#-----------------------------------------------------------------------------
 # Flex
 
 FLEX                   = @LEX@
@@ -590,6 +599,8 @@ INSTALL                     = @INSTALL@
 # 
 INSTALL                        := $(subst .././install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL))
 LATEX                  = latex
+HEVEA                  = hevea
+HACHA                  = hacha
 LN_S                   = @LN_S@
 MANMACROS              = -man
 MSMACROS               = -ms
@@ -713,10 +724,9 @@ LIT2TEXT           = $(LITERATE_PREFIX)lit2text
 # Stuff from fptools/ghc/utils
 #
 UNLIT                  = $(UNLIT_PREFIX)unlit$(EXE_SUFFIX)
-STAT2RESID             = $(STAT2RESID_PREFIX)stat2resid
 HP2PS                  = $(HP2PS_PREFIX)hp2ps$(EXE_SUFFIX)
-HSCPP                  = $(HSCPP_PREFIX)hscpp
 HSTAGS                 = $(HSTAGS_PREFIX)hstags
+HSC2HS                 = $(HSC2HS_PREFIX)hsc2hs-inplace
 
 #
 # Options for the compiling different `ways'. Various projects within
@@ -789,10 +799,6 @@ WAY_mp_HC_OPTS=-parallel
 WAY_mg_NAME=GranSim
 WAY_mg_HC_OPTS=-gransim
 
-# Way `dll': 
-WAY_dll_NAME=Win32 DLLs
-WAY_dll_HC_OPTS=-dll
-
 #
 # Add user-way configurations here:
 #