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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 0730759..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@
@@ -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
@@ -696,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+
@@ -878,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@