X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=5572f93d459a6f72d3f0209d5589d7a6bcf2e406;hb=fd87c1f8579dd5c118f1867bac42df86bc04ac54;hp=6bfc6282ad8d3fd5b101e56e32b25385ebc51b87;hpb=a7d8f43718b167689c0a4a4c23b33a325e0239f1;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 6bfc628..5572f93 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@
@@ -695,11 +696,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+
@@ -877,6 +877,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@