X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=0401de40c1f7c798413216b1db4555657b5f3f17;hb=88d2cf35d63e56fa01e98eb03d5271a846519c09;hp=0730759148c2029c0e20cc9a7e032b93396a767c;hpb=25a96d106f30518aadfbcb0da4f44e849778773e;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 0730759..0401de4 100644
--- 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 green-card 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 green-card 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@
@@ -542,8 +543,7 @@ endif
 #
 #	SRC_HC_OPTS += -O
 
-SRC_HC_OPTS += @CPPFLAGS@ @CFLAGS@ -H16m -O
-EXTRA_LD_OPTS+=	@LDFLAGS@
+SRC_HC_OPTS += -H16m -O
 
 # These flags make flex 8-bit
 SRC_FLEX_OPTS	+= -8
@@ -595,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/
@@ -696,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+
@@ -709,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@
 
 #-----------------------------------------------------------------------------
@@ -723,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
@@ -810,7 +803,6 @@ TIB			= tib
 TIME			= @TimeCmd@
 TROFF			= troff
 UNAME			= uname
-YACC			= @YaccCmd@
 
 #-----------------------------------------------------------------------------
 # SGML stuff
@@ -841,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
@@ -878,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@