X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=27c1ef3fd99182655423fba10d366d51d81585d8;hb=4586d01428cad472b2fbf050cd7cc00cd5d8b0a1;hp=3d7709087dc5f6ab9bb2ab8f0a057ecc8bdfbebf;hpb=febe9db13855ee93378b60624a7121b53ff9d238;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 3d77090..27c1ef3 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -86,6 +86,8 @@ HostVendor_CPP	                = @HostVendor_CPP@
 #
 LeadingUnderscore=@LeadingUnderscore@
 
+# Pin a suffix on executables? If so, what. (cygwin32 only).
+exeext=@exeext@
 
 #################################################################################
 #
@@ -109,18 +111,27 @@ LeadingUnderscore=@LeadingUnderscore@
 #		* ghc&hslibs next
 #		then it's up to you
 
-ProjectsToBuild   = glafp-utils literate happy ghc hslibs
+ProjectsToBuild   = glafp-utils literate ghc hslibs
 #
 # Make a distinction between building and installing, ProjectsToInstall
 # does not include the literate bits..
 #
-ProjectsToInstall = glafp-utils happy ghc hslibs
+ProjectsToInstall = glafp-utils ghc hslibs
 
 #
 # Should the various project tests directories be built?
 #
 IncludeTestDirsInBuild=NO
 
+#
+# Name variables for the main project
+#
+Project		  = Ghc
+ProjectName       = $($(Project)ProjectName)
+ProjectNameShort  = $($(Project)ProjectNameShort)
+ProjectVersion    = $($(Project)ProjectVersion)
+ProjectPatchLevel = $($(Project)ProjectPatchLevel)
+
 #################################################################################
 #
 #		GHC project
@@ -133,22 +144,10 @@ IncludeTestDirsInBuild=NO
 #
 # Name variables for ghc:
 # 
-GhcProjectName       =The Glorious Glasgow Haskell Compilation System
-GhcProjectNameShort  =ghc
-GhcProjectVersion    =2.06
-GhcProjectPatchLevel =0
-GhcBuildeeVersion    =206
-GhcBuilderVersion    =29
-
-#
-# Name variables for the fptools, for now equal to the above
-# ghc stuff
-#
-ProjectName       =$(GhcProjectName)
-ProjectNameShort  =$(GhcProjectNameShort)
-ProjectVersion    =$(GhcProjectVersion)
-ProjectPatchLevel =$(GhcProjectPatchLevel)
-
+GhcProjectName         = The Glorious Glasgow Haskell Compilation System
+GhcProjectNameShort    = ghc
+GhcProjectVersion      = 3.00
+GhcProjectPatchLevel   = 0
 
 #---------------------------------------------------------------
 #
@@ -158,10 +157,6 @@ ProjectPatchLevel =$(GhcProjectPatchLevel)
 #
 #   WithGhcHc	   Path name of the compiler to use
 #
-#   Ghc2_0	   Whether this compiler is GHC 2.0 or later
-#		   (which affects gruesome details about
-# 		   how mutually recursive modules are handled)
-#
 #   WithGhcHcType  What "type" of compiler is being used
 #		   Valid options:
 #		       	     HC_CHALMERS_HBC
@@ -169,8 +164,7 @@ ProjectPatchLevel =$(GhcProjectPatchLevel)
 #		       	     HC_ROJEMO_NHC
 #		       	     HC_UNSPECIFIED
 
-WithGhcHc = ghc-0.29
-Ghc2_0=NO
+WithGhcHc = ghc-2.10
 
 # Unused, we think
 # WithGhcHcType=HC_GLASGOW_GHC
@@ -215,9 +209,6 @@ GhcWithRegisterised=YES
 #   i386, alpha & sparc
 GhcWithNativeCodeGen=$(shell if (test x$(findstring $(HostArch_CPP),i386 alpha sparc) = x); then echo NO; else echo YES; fi)
 
-# Build the compiler with the deforester included?
-GhcWithDeforester=NO
-
 #
 # Building various ways?
 # (right now, empty if not).
@@ -243,8 +234,30 @@ GhcLibWays=p
 # 	-O is pretty desirable, otherwise no inlining of prelude
 #		things (incl "+") happens when compiling with this compiler
 
-GhcLibHcOpts= -O -split-objs -odir $(basename $*)
+#
+# Splitting profiled code produces awfully large archives under ELF, so
+# we turn it off here.
+#
+# ToDo: track down the source of this.
+#
+ifeq "$(strip $(way))" "p"
+GhcLibHcOpts= -O
+else 
+ifeq "$(strip $(way))" "mr"
+GhcLibHcOpts= -O
+else
+GhcLibHcOpts= -O -split-objs -odir $*
+endif
+endif
 
+# what to include in a binary distribution
+
+GhcMainDir = ghc
+GhcBinDistDirs = ghc hslibs
+GhcBinDistDocs = docs ghc/docs/users_guide ghc/docs/libraries
+GhcBinDistPrlScripts = ghc stat2resid hstags mkdependHS
+GhcBinDistLibPrlScripts = hscpp
+GhcBinDistBins = hp2ps
 
 #################################################################################
 #
@@ -286,13 +299,28 @@ HsLibHcOpts=$(GhcLibHcOpts)
 #
 #################################################################################
 
+#
+# Name variables for happy:
+#
+HappyProjectName       = Happy
+HappyProjectNameShort  = happy
+HappyProjectVersion    = 1.5
+HappyProjectPatchLevel = 0
+
 # The compiler you'd like to use to compile Happy
 WithHappyHc = $(WithGhcHc)
 
 # HappyHcOpts gives the flags to pass to the Haskell compiler used
-# 	      to compile the Happy source coed
+# 	      to compile the Happy sources with.
+#
 HappyHcOpts = 
 
+# what to include in a binary distribution
+
+HappyMainDir = happy
+HappyBinDistDirs = happy
+HappyBinDistDocs = happy/doc
+HappyBinDistShScripts = happy
 
 #################################################################################
 #
@@ -302,8 +330,6 @@ HappyHcOpts =
 #
 #################################################################################
 
-
-
 #################################################################################
 #
 #		green-card project
@@ -460,19 +486,19 @@ endif
 # override the various *_PREFIX in build.mk, i.e., having the following
 # in build.mk:
 #
-#   FASTMAKE_PREFIX=
+#   MKDEPENDC_PREFIX=
 #
-# will force `make' to rummage around in your PATH to find `fastmake' (not
+# will force `make' to rummage around in your PATH to find `mkdependC' (not
 # sure it would need it in the first place, but still).
 #
 GLAFP_UTILS  		= $(FPTOOLS_TOP)/glafp-utils
 
 SCRIPT_PREFIX 		= $(GLAFP_UTILS)/scripts/
-FASTMAKE_PREFIX		= $(GLAFP_UTILS)/fastmake/
 MKDEPENDC_PREFIX	= $(GLAFP_UTILS)/mkdependC/
 LTX_PREFIX		= $(GLAFP_UTILS)/ltx/
 RUNTEST_PREFIX		= $(GLAFP_UTILS)/runstdtest/
 VERBATIM_PREFIX		= $(GLAFP_UTILS)/verbatim/
+SGMLVERB_PREFIX		= $(GLAFP_UTILS)/sgmlverb/
 ETAGS_PREFIX		= $(GLAFP_UTILS)/etags/
 MSUB_PREFIX		= $(GLAFP_UTILS)/msub/
 LNDIR_PREFIX		= $(GLAFP_UTILS)/lndir/
@@ -502,13 +528,6 @@ HSTAGS_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/hstags/
 HC		= $(FPTOOLS_TOP)/ghc/driver/ghc
 MKDEPENDHS	= $(HC)
 
-#
-# The compiler proper is built with the 1.2 compiler,
-# so when building the dependencies, we need mkdependHS
-# for the 1.2 compiler.
-#
-MKDEPENDHS_1_2  = mkdependHS-1.2
-
 #-----------------------------------------------------------------------------
 # C compiler
 #
@@ -595,6 +614,12 @@ REAL_SHELL=$(SHELL)
 SIZE			= size
 STRIP			= strip
 TAR			= @TarCmd@
+
+#
+# Under cygwin32, we have to deal with .exe suffixes
+#
+EXE_SUFFIX=@ExeSuffix@
+
 #
 # This is special to literate/, ToDo: add literate-specific
 # configure setup to literate/.
@@ -610,29 +635,33 @@ TROFF			= troff
 UNAME			= uname
 YACC			= @YaccCmd@
 
+#-----------------------------------------------------------------------------
+# SGML stuff (currently not configured - we assume you have it)
+
+SGML2LATEX		= sgml2latex
+SGML2HTML		= sgml2html
+SGML2INFO		= sgml2info
+SGML2TXT		= sgml2txt
 
 #-----------------------------------------------------------------------------
 # 		FPtools support software
 
 # Stuff from fptools/glafp-utils
 MKDEPENDC 		= $(MKDEPENDC_PREFIX)mkdependC
-FASTMAKE 		= $(FASTMAKE_PREFIX)fastmake
 LTX 			= $(LTX_PREFIX)ltx
 MKDIRHIER		= $(MKDIRHIER_PREFIX)mkdirhier
 LNDIR			= $(LNDIR_PREFIX)lndir
 MSUB			= $(MSUB_PREFIX)msub
 ETAGS			= $(ETAGS_PREFIX)etags
 VERBATIM		= $(VERBATIM_PREFIX)verbatim
+SGMLVERB		= $(SGMLVERB_PREFIX)sgmlverb
+SGML2LATEX		= sgml2latex
 RUNTEST			= $(RUNTEST_PREFIX)runstdtest
 HAPPY			= @HappyCmd@
 HAPPY_VERSION		= @HappyVersion@		
 LX			= @LxCmd@
 GREENCARD		= @GreencardCmd@
 
-ifeq "$(HAPPY)" ""
-HAPPY			= $(HAPPY_PREFIX)happy
-endif
-
 #
 # Stuff from fptools/literate
 #