[project @ 2003-08-27 15:18:29 by panne]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 6bfc628..3153e49 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -101,9 +101,9 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 
 # build the libs first if we're bootstrapping from .hc files
 ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils libraries hslibs ghc green-card happy hdirect hood nofib haddock
+AllProjects = glafp-utils libraries hslibs ghc greencard happy hdirect hood nofib haddock alex
 else
-AllProjects = glafp-utils ghc libraries hslibs green-card happy hdirect hood nofib haddock
+AllProjects = glafp-utils ghc libraries hslibs greencard happy hdirect hood nofib haddock alex
 endif
 
 #
@@ -349,6 +349,7 @@ GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
 GL_CFLAGS=@GL_CFLAGS@
 GL_LIBS=@GL_LIBS@
+GLUT_LIBS=@GLUT_LIBS@
 
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@
@@ -385,9 +386,9 @@ HappyHcOpts = -O
 
 ################################################################################
 #
-#              green-card project
+#              greencard project
 #
-#      Green-card specific options
+#      GreenCard specific options
 #
 ################################################################################
 
@@ -594,7 +595,6 @@ RUNTEST_PREFIX              = $(GLAFP_UTILS)/runstdtest/
 VERBATIM_PREFIX                = $(GLAFP_UTILS)/verbatim/
 SGMLVERB_PREFIX                = $(GLAFP_UTILS)/sgmlverb/
 ETAGS_PREFIX           = $(GLAFP_UTILS)/etags/
-MSUB_PREFIX            = $(GLAFP_UTILS)/msub/
 LNDIR_PREFIX           = $(GLAFP_UTILS)/lndir/
 MKDIRHIER_PREFIX       = $(GLAFP_UTILS)/mkdirhier/
 DOCBOOK_PREFIX         = $(GLAFP_UTILS)/docbook/
@@ -695,11 +695,10 @@ HaveLibMingwEx    = @HaveLibMingwEx@
 HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
 
 #-----------------------------------------------------------------------------
-# Regex libraries
+# Regex library
 # (if present in libc use that one, otherwise use the one in the tree)
 #
 HavePosixRegex  = @HavePosixRegex@
-HaveGNURegex   = @HaveGNURegex@
 
 #-----------------------------------------------------------------------------
 # GTK+
@@ -708,11 +707,11 @@ GTK_CONFIG                = @GTK_CONFIG@
 GTK_VERSION            = @GTK_VERSION@
 
 #-----------------------------------------------------------------------------
-# Flex
+# Flex (currently unused, could be moved to glafp-utils)
 
-FLEX                   = @LEX@
+# FLEX                 = @LEX@
 # Don't bother with -lfl, we define our own yywrap()s anyway.
-FLEX_LIB               = 
+# FLEX_LIB             = 
 #WAS:FLEX_LIB          = @LEXLIB@
 
 #-----------------------------------------------------------------------------
@@ -722,11 +721,6 @@ AR                 = @ArCmd@
 ArSupportsInput                = @ArSupportsInput@
 # Yuckage: for ghc/utils/parallel -- todo: nuke this dependency!!
 BASH                    = /usr/local/bin/bash
-#
-# Could be either gzip or compress
-#
-COMPRESS               = @CompressCmd@
-COMPRESS_SUFFIX         = @CompressSuffix@
 
 CONTEXT_DIFF           = @ContextDiffCmd@
 CP                     = cp
@@ -809,7 +803,6 @@ TIB                 = tib
 TIME                   = @TimeCmd@
 TROFF                  = troff
 UNAME                  = uname
-YACC                   = @YaccCmd@
 
 #-----------------------------------------------------------------------------
 # SGML stuff
@@ -840,7 +833,6 @@ MKDEPENDC           = $(MKDEPENDC_PREFIX)mkdependC
 LTX                    = $(LTX_PREFIX)ltx
 MKDIRHIER              = $(MKDIRHIER_PREFIX)mkdirhier
 LNDIR                  = $(LNDIR_PREFIX)lndir
-MSUB                   = $(MSUB_PREFIX)msub
 ETAGS                  = $(ETAGS_PREFIX)etags
 VERBATIM               = $(VERBATIM_PREFIX)verbatim
 SGMLVERB               = $(SGMLVERB_PREFIX)sgmlverb
@@ -861,10 +853,10 @@ ILASM                   = ilasm
 GHC_PKG                        = @GhcPkgCmd@
 
 #
-# Greencard
+# GreenCard
 #
-GREENCARD              = @GreencardCmd@
-GREENCARD_VERSION      = @GreencardVersion@            
+GREENCARD              = @GreenCardCmd@
+GREENCARD_VERSION      = @GreenCardVersion@            
 
 #
 # Happy
@@ -877,6 +869,16 @@ HAPPY_VERSION              = @HappyVersion@
 GHC_HAPPY_OPTS         = -agc
 
 #
+# Alex
+#
+ALEX                   = @AlexCmd@
+ALEX_VERSION           = @AlexVersion@         
+#
+# Options to pass to Happy when we're going to compile the output with GHC
+#
+GHC_ALEX_OPTS          = -g
+
+#
 # Haddock
 # 
 HADDOCK                        = @HaddockCmd@