X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=daf0b4df4b14c74afb20a5d5f697d2313e0d877a;hb=e3dc3922399305df9c8320586c9add3b33f846d8;hp=97214677d7e5b5a28517fbd705bad177df6a0f5c;hpb=2b7c9eee6ede798b77cea465f4207d881a4eaf73;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 9721467..daf0b4d 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -139,11 +139,15 @@ BootingFromHc = @BootingFromHc@
 # rather than registerised code, i.e., disable the mangler?
 BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 
-# build the libs first if we're bootstrapping from .hc files
+# Build Order: we build Happy, Haddock and Alex before GHC if they are
+# in this source tree, just in case our GHC build depends on these
+# local builds rather than installed versions of the tools.
+#
+# Build the libs first if we're bootstrapping from .hc files.
 ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils libraries hslibs ghc greencard happy hdirect hood nofib haddock alex
+AllProjects = glafp-utils happy alex haddock libraries hslibs ghc greencard hdirect hood nofib
 else
-AllProjects = glafp-utils ghc libraries hslibs greencard happy hdirect hood nofib haddock alex
+AllProjects = glafp-utils happy alex haddock ghc libraries hslibs greencard hdirect hood nofib
 endif
 
 #
@@ -164,6 +168,11 @@ ProjectsDontInstall = glafp-utils nofib
 IncludeTestDirsInBuild=NO
 
 #
+# Should the various project example directories be built?
+#
+IncludeExampleDirsInBuild=NO
+
+#
 # Which ways should SGML documents be built?
 # options are: dvi ps pdf html rtf
 #
@@ -221,11 +230,9 @@ GhcStage3HcOpts=
 # (way 'u') to get unregisterised code, but the default way will be
 # registerised.
 #
-# NOTE: this is not the same as building the compiler itself
-# unregisterised.  That's done by either (a) bootstrapping with a
-# compiler that was built with GhcUnregisterised=YES, or (b)
-# bootstrapping with a compiler that has way 'u' libraries, and the
-# flag '-unreg' is added to GhcHcOpts above.
+# NOTE: the stage1 compiler will be a registerised binary (assuming
+# the compiler you build with is generating registerised binaries), but
+# the stage2 compiler will be an unregisterised binary.
 #
 GhcUnregisterised=NO
 
@@ -367,7 +374,7 @@ GhcRtsThreaded=@ThreadedRts@
 
 # Build the Haskell Readline bindings?
 #
-GhcLibsWithReadline=@HaveReadlineHeaders@
+GhcLibsWithReadline=@GhcLibsWithReadline@
 
 # Libraries needed for linking with readline
 LibsReadline=@LibsReadline@
@@ -384,22 +391,34 @@ LIBM=@LIBM@
 #
 GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
 
-# Build the Haskell OpenGL/GLUT binding?
+# Build the Haskell OpenGL binding?
 #
-GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
+GhcLibsWithOpenGL=@GhcLibsWithOpenGL@
 GL_CFLAGS=@GL_CFLAGS@
 GL_LIBS=@GL_LIBS@
+
+# Build the Haskell OpenAL binding?
+#
+GhcLibsWithOpenAL=@GhcLibsWithOpenAL@
+
+# Build the Haskell GLUT binding?
+#
+GhcLibsWithGLUT=@GhcLibsWithGLUT@
 GLUT_LIBS=@GLUT_LIBS@
 
+# X11 stuff
+#
 X_CFLAGS=@X_CFLAGS@
 X_LIBS=@X_LIBS@
 
-
-# 
 # .NET interop support?
 #
 DotnetSupport=@DotnetSupport@
 
+# Build unix package?
+#
+GhcLibsWithUnix=@GhcLibsWithUnix@
+
 ################################################################################
 #
 #		happy project
@@ -744,7 +763,6 @@ HavePosixRegex  = @HavePosixRegex@
 # GTK+
 
 GTK_CONFIG		= @GTK_CONFIG@
-GTK_VERSION		= @GTK_VERSION@
 
 #-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)