X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=ddfce03aeb0e25d59cfcf72e64a862474768dac8;hb=ca9f59db55f686347d42e6e5938a24ce21521d2e;hp=6bfc6282ad8d3fd5b101e56e32b25385ebc51b87;hpb=a4b89a846d01b7f12171aea26354f8ea783eda35;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index 6bfc628..ddfce03 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@ @@ -877,6 +878,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@