projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-08-13 12:51:01 by simonmar]
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
91344c1
..
ddfce03
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"
# 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
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
#
endif
#
@@
-349,10
+349,17
@@
GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
GL_CFLAGS=@GL_CFLAGS@
GL_LIBS=@GL_LIBS@
GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
GL_CFLAGS=@GL_CFLAGS@
GL_LIBS=@GL_LIBS@
+GLUT_LIBS=@GLUT_LIBS@
X_CFLAGS=@X_CFLAGS@
X_LIBS=@X_LIBS@
X_CFLAGS=@X_CFLAGS@
X_LIBS=@X_LIBS@
+
+#
+# .NET interop support?
+#
+DotnetSupport=@DotnetSupport@
+
################################################################################
#
# happy project
################################################################################
#
# happy project
@@
-871,6
+878,16
@@
HAPPY_VERSION = @HappyVersion@
GHC_HAPPY_OPTS = -agc
#
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@
# Haddock
#
HADDOCK = @HaddockCmd@