[project @ 1998-03-11 13:56:18 by simonm]

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 27c1ef3..bdc4fae 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -106,17 +106,15 @@ exeext=@exeext@
 # projects use others you must list them in the correct order.
 #
 # Generally:   * glafp-utils should be first
-#              * literate next
 #              * happy next
-#              * ghc&hslibs next
+#              * ghc next
 #              then it's up to you
 
-ProjectsToBuild   = glafp-utils literate ghc hslibs
+ProjectsToBuild   = glafp-utils ghc
 #
-# Make a distinction between building and installing, ProjectsToInstall
-# does not include the literate bits..
+# Make a distinction between building and installing
 #
-ProjectsToInstall = glafp-utils ghc hslibs
+ProjectsToInstall = glafp-utils ghc
 
 #
 # Should the various project tests directories be built?
@@ -130,6 +128,7 @@ Project               = Ghc
 ProjectName       = $($(Project)ProjectName)
 ProjectNameShort  = $($(Project)ProjectNameShort)
 ProjectVersion    = $($(Project)ProjectVersion)
+ProjectVersionInt = $($(Project)ProjectVersionInt)
 ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 
 #################################################################################
@@ -144,9 +143,13 @@ ProjectPatchLevel = $($(Project)ProjectPatchLevel)
 #
 # Name variables for ghc:
 # 
+# *ProjectVersion    is treated as a *string*
+# *ProjectVersionInt is treated as an *integer* (for cpp defines)
+
 GhcProjectName         = The Glorious Glasgow Haskell Compilation System
 GhcProjectNameShort    = ghc
-GhcProjectVersion      = 3.00
+GhcProjectVersion      = 3.02
+GhcProjectVersionInt   = 302
 GhcProjectPatchLevel   = 0
 
 #---------------------------------------------------------------
@@ -246,50 +249,36 @@ else
 ifeq "$(strip $(way))" "mr"
 GhcLibHcOpts= -O
 else
+ifeq "$(GhcWithHscBuiltViaC)" "NO"
 GhcLibHcOpts= -O -split-objs -odir $*
+else
+#NB: .hc files need to distributed in *unsplit* form.
+GhcLibHcOpts= -O
+endif
 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
-
-#################################################################################
-#
-#              hslibs project
-#
-#      Set of (configurable) options needed by the Haskell libraries (hslibs)
-#      plus their default options (if any).
-#
-#################################################################################
 
 # Build the Haskell Readline bindings?
 #
-HsLibsWithReadline=NO
+GhcLibsWithReadline=NO
 #
 # Include path to readline.h
 # (no path == in standard include path)
 #
 ReadlineIncludePath=
 
-# Build the socket libraries?
+# Build the socket libraries?  (ToDo: is this used?)
 #
-HsLibsWithSockets=YES
+GhcLibsWithSockets=YES
 
-#
-# The different ways to build hslibs. Default is just to mirror
-# what is done for the ghc prelude libraries.
-#
-HsLibWays=$(GhcLibWays)
+# what to include in a binary distribution
 
-# Option flags for hslibs are by default the same as for the options
-# used for the prelude libs (see above).
-HsLibHcOpts=$(GhcLibHcOpts)
+GhcMainDir = ghc
+GhcBinDistDirs = ghc
+GhcBinDistDocs = docs ghc/docs/users_guide ghc/docs/libraries
+GhcBinDistPrlScripts = ghc-$(GhcProjectVersion) stat2resid hstags mkdependHS
+GhcBinDistLibPrlScripts = hscpp
+GhcBinDistBins = hp2ps
 
 #################################################################################
 #
@@ -305,6 +294,7 @@ HsLibHcOpts=$(GhcLibHcOpts)
 HappyProjectName       = Happy
 HappyProjectNameShort  = happy
 HappyProjectVersion    = 1.5
+HappyProjectVersionInt = 15
 HappyProjectPatchLevel = 0
 
 # The compiler you'd like to use to compile Happy
@@ -660,7 +650,7 @@ RUNTEST                     = $(RUNTEST_PREFIX)runstdtest
 HAPPY                  = @HappyCmd@
 HAPPY_VERSION          = @HappyVersion@                
 LX                     = @LxCmd@
-GREENCARD              = @GreencardCmd@
+GREENCARD              = $(FPTOOLS_TOP)/green-card/src/green-card
 
 #
 # Stuff from fptools/literate
@@ -691,7 +681,7 @@ HSTAGS                      = $(HSTAGS_PREFIX)hstags
 # Options for the compiling different `ways'. Various projects within
 # the glorious fptools tree support building in various user-configured
 # ways. For instance, you could set up one `way' such that the prelude
-# libraries and hslibs all were built with the option -ffoldr-build-on.
+# libraries all were built with the option -ffoldr-build-on.
 # 
 # To configure up your own way, have a look at some of the standard ways
 # such as profiling, and create your own set of WAY_*_OPTS defs below.