[project @ 1998-08-14 12:27:44 by sof]

Project specific settings now reside in config.mk; version info in version.mk

diff --git a/ghc/mk/config.mk b/ghc/mk/config.mk
new file mode 100644 (file)
index 0000000..dbc0af6
--- /dev/null
+++ b/ghc/mk/config.mk
@@ -0,0 +1,14 @@
+#
+# GHC project configuration
+#
+#  
+
+# what to include in a binary distribution
+GhcMainDir = ghc
+GhcBinDistDirs = ghc
+GhcBinDistDocs = docs ghc/docs/users_guide ghc/docs/libraries
+GhcBinDistPrlScripts = ghc-$(ProjectVersion) stat2resid hstags mkdependHS
+GhcBinDistLibPrlScripts = hscpp
+GhcBinDistBins = hp2ps
+
+include version.mk

diff --git a/ghc/mk/suffix.mk b/ghc/mk/suffix.mk
index 74d6e23..08c3d4c 100644 (file)
--- a/ghc/mk/suffix.mk
+++ b/ghc/mk/suffix.mk
@@ -1,6 +1,6 @@
 #################################################################################
 #
-#       $Id: suffix.mk,v 1.3 1997/09/04 19:51:32 sof Exp $
+#       $Id: suffix.mk,v 1.4 1998/08/14 12:27:45 sof Exp $
 #
 #              GHC-specific suffix rules
 #
@@ -13,7 +13,10 @@
 # resides in a directory parser/
 #
 
-parser/%.h parser/%.c parser/U_%.hs : parser/%.ugn
+parser/U_%.hs : parser/%.c
+       @:
+
+parser/%.h parser/%.c : parser/%.ugn
        @$(RM) $@ parser/$*.c parser/$*.hs parser/U_$*.hs parser/$*.h
        $(UGEN) $< || $(RM) parser/$*.h parser/$*.c parser/$*.hs
        @$(MV) -f parser/$*.hs parser/U_$*.hs

diff --git a/ghc/mk/version.mk b/ghc/mk/version.mk
new file mode 100644 (file)
index 0000000..8b467a7
--- /dev/null
+++ b/ghc/mk/version.mk
@@ -0,0 +1,41 @@
+#
+# Project-specific version information.
+#
+# Note:
+#   this config file is intended to centralise all
+#   project version information. To bump up the version
+#   info on your package, edit this file and recompile
+#   all the dependents. This file lives in the source tree.
+#
+# In the case of the ghc/ project, if you make changes
+# to this file, you'll *have to* to rebuild the driver
+# in your build tree(s). The ghc/driver/Makefile has got
+# a dependency that will force such rebuilding to happen,
+# but it does require you to do a 'make' in ghc/driver.
+
+#
+# Ghc project settings:
+# 
+# *ProjectVersion    is treated as a *string*
+# *ProjectVersionInt is treated as an *integer* (for cpp defines)
+
+ProjectName       = The Glorious Glasgow Haskell Compilation System
+ProjectNameShort  = ghc
+ProjectVersion    = 3.03
+ProjectVersionInt = 303
+ProjectPatchLevel = 0
+
+#
+# Optionally, you can get the compiler driver to check the
+# version consistency between the object files being linked.
+# 
+# Major numbers must always agree, minor disagreements yield a warning.
+#
+# These version numbers are currently separate from the project
+# version - one (semi-valid) reason for having them separate is that
+# object files produced by different versions of the compiler need
+# not be incompatible..
+HscMajorVersion=33
+HscMinorVersion=0
+CcMajorVersion=36
+CcMinorVersion=1