[project @ 2001-01-08 12:31:34 by rrt]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index f6a798a..4390373 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -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,7 +215,7 @@ 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
@@ -497,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
@@ -524,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
@@ -599,7 +599,8 @@ INSTALL                     = @INSTALL@
 # 
 INSTALL                        := $(subst .././install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL))
 LATEX                  = latex
-LATEX2HTML             = hevea
+HEVEA                  = hevea
+HACHA                  = hacha
 LN_S                   = @LN_S@
 MANMACROS              = -man
 MSMACROS               = -ms
@@ -723,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