X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=2ddfe828a81d4d37497de15930391f623109601b;hb=fa8246c79fa10ff6785888b95acdf1b3cfb59d9b;hp=3040feb8cbc6d4b546ad1ad6970e84dc269681cb;hpb=ef8b706b5ab4217b5134eee75c0fe4e22a5154fb;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 3040feb..2ddfe82 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -124,6 +124,13 @@ LeadingUnderscore=@LeadingUnderscore@
 # Pin a suffix on executables? If so, what (Windows only).
 exeext=@exeext@
 
+# Windows=YES if on a Windows platform
+ifneq "$(findstring $(HostOS_CPP), mingw32 cygwin32)" ""
+Windows=YES
+else
+Windows=NO
+endif
+
 ################################################################################
 #
 #		project-wide flags
@@ -145,9 +152,9 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 #
 # Build the libs first if we're bootstrapping from .hc files.
 ifeq "$(BootingFromHc)" "YES"
-AllProjects = glafp-utils happy alex haddock libraries hslibs ghc greencard hdirect hood nofib
+AllProjects = glafp-utils happy alex haddock libraries hslibs ghc greencard hdirect hood nofib docs
 else
-AllProjects = glafp-utils happy alex haddock ghc libraries hslibs greencard hdirect hood nofib
+AllProjects = glafp-utils happy alex haddock ghc libraries hslibs greencard hdirect hood nofib docs
 endif
 
 #
@@ -173,10 +180,10 @@ IncludeTestDirsInBuild=NO
 IncludeExampleDirsInBuild=NO
 
 #
-# Which ways should SGML documents be built?
-# options are: dvi ps pdf html rtf
+# Which ways should DocBook XML documents be built?
+# options are: dvi ps pdf html
 #
-SGMLDocWays=
+XMLDocWays=
 
 ################################################################################
 #
@@ -240,8 +247,9 @@ GhcUnregisterised=NO
 # (as well as a C backend)
 #
 # Target platforms supported:
-#   i386, sparc & powerpc
-ifneq "$(findstring $(HostArch_CPP), i386 sparc powerpc)" ""
+#   i386, powerpc
+#   sparc has bitrotted
+ifneq "$(findstring $(HostArch_CPP), i386 powerpc)" ""
 GhcWithNativeCodeGen=YES
 else
 GhcWithNativeCodeGen=NO
@@ -288,6 +296,7 @@ endif
 #   thr_p       : threaded profiled
 #   debug       : debugging (compile with -g for the C compiler, and -DDEBUG)
 #   debug_p     : debugging profiled
+#   debug_u     : debugging unregisterised
 #   thr_debug   : debugging threaded
 #   thr_debug_p : debugging threaded profiled
 #
@@ -310,17 +319,6 @@ GhcLibHcOpts=-O -Rghc-timing
 # Win32 only: Enable the RTS and libraries to be built as DLLs
 DLLized=@EnableWin32DLLs@
 
-# Win32 only: are we building a compiler that tries to reduce external
-# dependencies? i.e., one that doesn't assume that the user has got
-# the cygwin toolchain installed on his/her Win32 box.
-#
-# GHC is still dependent on GNU tools in the backend (gcc to further process
-# .c/.hc/.s/.o files + 'perl' to mangle and split), but using this
-# option a GHC distribution can be put together which includes a minimal
-# set of these open source tools. 
-#
-MinimalUnixDeps=@MinimalUnixDeps@
-
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
 #
@@ -364,11 +362,6 @@ GhcRtsCcOpts=-fomit-frame-pointer
 # Include the front panel code?  Needs GTK+.
 GhcRtsWithFrontPanel = NO
 
-# DEPRECATED:
-# This option is no longer used.  We now always build the threaded RTS,
-# add the flag '-threaded' to GHC to get it.
-GhcRtsThreaded=@ThreadedRts@
-
 ################################################################################
 #
 # libraries project
@@ -394,27 +387,6 @@ LIBM=@LIBM@
 #
 GhcLibsWithObjectIO=@GhcLibsWithObjectIO@
 
-# Build the Haskell OpenGL binding?
-#
-GhcLibsWithOpenGL=@GhcLibsWithOpenGL@
-GLU_CFLAGS=@GLU_CFLAGS@
-GLU_LIBS=@GLU_LIBS@
-
-# Build the Haskell OpenAL binding?
-#
-GhcLibsWithOpenAL=@GhcLibsWithOpenAL@
-
-# Build the Haskell GLUT binding?
-#
-GhcLibsWithGLUT=@GhcLibsWithGLUT@
-GLUT_LIBS=@GLUT_LIBS@
-
-# X11 stuff
-#
-GhcLibsWithX11=@GhcLibsWithX11@
-X_CFLAGS=@X_CFLAGS@
-X_LIBS=@X_LIBS@
-
 # .NET interop support?
 #
 DotnetSupport=@DotnetSupport@
@@ -530,28 +502,36 @@ prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 bindir			= @bindir@
 datadir0		= @datadir@
-
-#sysconfdir		= @datadir@
-#sharedstatedir		= @sharedstatedir@
-#localstatedir		= @localstatedir@
 libdir0			= @libdir@
 includedir		= @includedir@
 oldincludedir		= @oldincludedir@
 mandir			= @mandir@
 
-#UNUSED:infodir		= @infodir@
-#UNUSED:srcdir          = @srcdir@
+ifeq "$(Windows)" "YES"
+
+ifeq "$(strip $(prefix))" ""
+prefix		= c:/ghc
+endif
+
+# Hack: our directory layouts tend to be different on Windows, so
+# hack around configure's bogus assumptions here.
+datadir 	= $(prefix)
+libdir		= $(prefix)
+
+else
 
 #
-# override libdir and datadir to put project-specific stuff in
+# Unix: override libdir and datadir to put project-specific stuff in
 # a subdirectory with the version number included.
 #
 libdir     = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort)-$(ProjectVersion),$(libdir0))
 datadir    = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort)-$(ProjectVersion),$(datadir0))
 
+endif # Windows
+
 # Default place for putting interface files is $(libdir)
 # (overriden for packages in package.mk)
-ifacedir   = $(libdir)
+ifacedir		= $(libdir)
 
 # 
 # Default values for most of the above are only set if
@@ -590,11 +570,31 @@ ifeq "$(strip $(mandir))" ""
 mandir		= $(prefix)/man
 endif
 
-################################################################################
+#-----------------------------------------------------------------------------
+# install configuration
+
 #
-#		Utilities programs: flags
+# Set this to have files installed with a specific owner
 #
-################################################################################
+INSTALL_OWNER =
+
+# 
+# Set this to have files installed with a specific group
+#
+INSTALL_GROUP =
+
+#
+# Invocations of `install' for the four different classes
+# of targets:
+#
+INSTALL_PROGRAM = $(INSTALL) -m 755
+INSTALL_SCRIPT  = $(INSTALL) -m 755
+INSTALL_SHLIB   = $(INSTALL) -m 755
+INSTALL_DATA    = $(INSTALL) -m 644
+INSTALL_DIR     = $(MKDIRHIER)
+
+# -----------------------------------------------------------------------------
+# Utilities programs: flags 
 
 # If you want to give any standard flags to pretty much any utility
 # (see utils.mk for a complete list), by adding a line here
@@ -684,6 +684,7 @@ HSC2HS_PREFIX		= $(FPTOOLS_TOP)/ghc/utils/hsc2hs/
 # (because the version numbers have to be calculated).
 
 GHC		= @WithGhc@
+GhcDir          = $(dir $(GHC))
 GhcVersion	= @GhcVersion@
 GhcMajVersion	= @GhcMajVersion@
 GhcMinVersion	= @GhcMinVersion@
@@ -723,11 +724,13 @@ GHC_STAGE3 	= $(FPTOOLS_TOP)/ghc/compiler/stage3/ghc-inplace
 HaveGcc 	= @HaveGcc@
 UseGcc  	= YES
 WhatGccIsCalled = @WhatGccIsCalled@
+GccVersion      = @GccVersion@
 ifeq "$(strip $(HaveGcc))" "YES"
 ifneq "$(strip $(UseGcc))"  "YES"
   CC	= cc
 else
   CC	= $(WhatGccIsCalled)
+  GccDir = $(dir $(WhatGccIsCalled))
 endif
 endif
 
@@ -738,9 +741,6 @@ ifeq "$(TARGETPLATFORM)" "ia64-unknown-linux"
 SRC_CC_OPTS += -G0
 endif
 
-# Solaris2 strikes again.
-unix_SRC_HSC2HS_OPTS += @unix_SRC_HSC2HS_OPTS@
-
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)
 #
@@ -764,11 +764,6 @@ HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
 HavePosixRegex  = @HavePosixRegex@
 
 #-----------------------------------------------------------------------------
-# GTK+
-
-GTK_CONFIG		= @GTK_CONFIG@
-
-#-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
 
 # FLEX			= @LEX@
@@ -818,12 +813,17 @@ RM			= rm -f
 SED			= @SedCmd@
 SHELL			= /bin/sh
 
+LD			= @LdCmd@
+
 # Some ld's support the -x flag and some don't, so the configure
 # script detects which we have and sets LdXFlag to "-x" or ""
 # respectively.
-LD			= @LdCmd@
 LD_X			= @LdXFlag@
 
+# GNU ld supports input via a linker script, which is useful to avoid
+# overflowing command-line length limits.
+LdIsGNULd		= @LdIsGNULd@
+
 #
 # In emergency situations, REAL_SHELL is used to perform shell commands
 # from within the ghc driver script, by scribbling the command line to
@@ -867,25 +867,20 @@ TROFF			= troff
 UNAME			= uname
 
 #-----------------------------------------------------------------------------
-# SGML stuff
-
-JADE			= @JadeCmd@
+# DocBook XML stuff
 
-SGML2DVI		= $(DOCBOOK_PREFIX)db2dvi
-SGML2HTML		= $(DOCBOOK_PREFIX)db2html
-SGML2PS			= $(DOCBOOK_PREFIX)db2ps
-SGML2PDF		= $(DOCBOOK_PREFIX)db2pdf
-SGML2RTF		= $(DOCBOOK_PREFIX)db2rtf
+XSLTPROC		= @XsltprocCmd@
+XMLLINT			= @XmllintCmd@
+FOP			= @FopCmd@
+XMLTEX			= @XmltexCmd@
+PDFXMLTEX		= @PdfxmltexCmd@
+DVIPS			= @DvipsCmd@
 
-SGMLSTYLESHEET          = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
+DIR_DOCBOOK_XSL		= @DIR_DOCBOOK_XSL@
 
-SRC_SGML2DVI_OPTS       = -d $(SGMLSTYLESHEET)
-SRC_SGML2HTML_OPTS      = -d $(SGMLSTYLESHEET)
-SRC_SGML2PS_OPTS      	= -d $(SGMLSTYLESHEET)
-SRC_SGML2RTF_OPTS       = -d $(SGMLSTYLESHEET)
-SRC_SGML2PDF_OPTS       = -d $(SGMLSTYLESHEET)
-
-DOCBOOK_CATALOG		= @Catalog@
+XSLTPROC_LABEL_OPTS	= --stringparam toc.section.depth 3 \
+			  --stringparam section.autolabel 1 \
+			  --stringparam section.label.includes.component.label 1
 
 #-----------------------------------------------------------------------------
 # 		FPtools support software
@@ -899,7 +894,6 @@ ETAGS			= $(ETAGS_PREFIX)etags
 VERBATIM		= $(VERBATIM_PREFIX)verbatim
 SGMLVERB		= $(SGMLVERB_PREFIX)sgmlverb
 RUNTEST			= $(RUNTEST_PREFIX)runstdtest
-LX			= @LxCmd@
 
 BLD_DLL			= dllwrap
 
@@ -1063,6 +1057,10 @@ WAY_debug_HC_OPTS=-optc-DDEBUG
 WAY_debug_p_NAME=debug profiled
 WAY_debug_p_HC_OPTS=-optc-DDEBUG -prof
 
+# Way 'debug_u':
+WAY_debug_u_NAME=debug unregisterised
+WAY_debug_u_HC_OPTS=-optc-DDEBUG -unreg
+
 # Way 'thr_debug':
 WAY_thr_debug_NAME=threaded
 WAY_thr_debug_HC_OPTS=-optc-DTHREADED_RTS -optc-DDEBUG