projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2002-11-13 12:21:08 by simonmar]
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
277ca89
..
e693b2d
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-346,6
+346,10
@@
ReadlineIncludePath=
# Math library
LIBM=@LIBM@
# Math library
LIBM=@LIBM@
+# Build the ObjectIO ?
+#
+GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
+
# Build the Haskell OpenGL/GLUT binding?
#
GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
# Build the Haskell OpenGL/GLUT binding?
#
GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
@@
-531,7
+535,6
@@
ifeq "$(strip $(mandir))" ""
mandir = $(prefix)/man
endif
mandir = $(prefix)/man
endif
-
################################################################################
#
# Utilities programs: flags
################################################################################
#
# Utilities programs: flags
@@
-643,6
+646,9
@@
MKDEPENDHS = $(GHC)
# tree). We can refer to "this ghc" as $(GHC_INPLACE):
GHC_INPLACE = $(FPTOOLS_TOP)/ghc/compiler/ghc-inplace
# tree). We can refer to "this ghc" as $(GHC_INPLACE):
GHC_INPLACE = $(FPTOOLS_TOP)/ghc/compiler/ghc-inplace
+GHC_STAGE1 = $(FPTOOLS_TOP)/ghc/compiler/stage1/ghc-inplace
+GHC_STAGE2 = $(FPTOOLS_TOP)/ghc/compiler/stage2/ghc-inplace
+GHC_STAGE3 = $(FPTOOLS_TOP)/ghc/compiler/stage3/ghc-inplace
#-----------------------------------------------------------------------------
# C compiler
#-----------------------------------------------------------------------------
# C compiler
@@
-681,6
+687,11
@@
LibGmp = @LibGmp@
HaveLibMingwEx = @HaveLibMingwEx@
#-----------------------------------------------------------------------------
HaveLibMingwEx = @HaveLibMingwEx@
#-----------------------------------------------------------------------------
+# HaskellSupport framework (Mac OS X)
+#
+HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
+
+#-----------------------------------------------------------------------------
# Regex libraries
# (if present in libc use that one, otherwise use the one in the tree)
#
# Regex libraries
# (if present in libc use that one, otherwise use the one in the tree)
#
@@
-740,9
+751,9
@@
MSMACROS = -ms
MV = mv
NROFF = nroff
PERL = @PerlCmd@
MV = mv
NROFF = nroff
PERL = @PerlCmd@
+PYTHON = @PythonCmd@
PIC = pic
PREPROCESSCMD = $(CC) -E
PIC = pic
PREPROCESSCMD = $(CC) -E
-PRINTER = lpr
RANLIB = @RANLIB@
RM = rm -f
SED = @SedCmd@
RANLIB = @RANLIB@
RM = rm -f
SED = @SedCmd@
@@
-783,11
+794,6
@@
TAR = @TarCmd@
ZIP = zip
#
ZIP = zip
#
-# Under Windows, we have to deal with .exe suffixes
-#
-EXE_SUFFIX=@exeext@
-
-#
# This is special to literate/, ToDo: add literate-specific
# configure setup to literate/.
#
# This is special to literate/, ToDo: add literate-specific
# configure setup to literate/.
#
@@
-876,8
+882,8
@@
LIT2TEXT = $(LITERATE_PREFIX)lit2text
#
# Stuff from fptools/ghc/utils
#
#
# Stuff from fptools/ghc/utils
#
-UNLIT = $(UNLIT_PREFIX)unlit$(EXE_SUFFIX)
-HP2PS = $(HP2PS_PREFIX)hp2ps$(EXE_SUFFIX)
+UNLIT = $(UNLIT_PREFIX)unlit$(exeext)
+HP2PS = $(HP2PS_PREFIX)hp2ps$(exeext)
HSTAGS = $(HSTAGS_PREFIX)hstags
HSC2HS = $(HSC2HS_PREFIX)hsc2hs-inplace
HSTAGS = $(HSTAGS_PREFIX)hstags
HSC2HS = $(HSC2HS_PREFIX)hsc2hs-inplace