Fix scoped type variables for expression type signatures
[ghc-hetmet.git] / Makefile
index d41c501..736aa53 100644 (file)
--- a/Makefile
+++ b/Makefile
 ############################################################################
 #
-#                      fptools/Makefile
+#              This is the top-level Makefile for GHC
 #
-#              This is the main Makefile for fptools.
+# Targets: 
+#
+#      bootsrap (DEFAULT)
+#              Builds GHC, then builds the libraries,
+#              then uses this GHC ("stage 1") to build itself
+#              ("stage 2").
+#
+#      bootstrap2
+#              Same as bootstrap
+#
+#      bootstrap3
+#              bootstrap2 + we build GHC one more time ("stage 3")
+#
+#      stage1
+#              Just build up to stage 1
+#
+#      stage2
+#              Just build stage 2 (stage 1 must be built)
+#
+#      stage3
+#              Just build stage 3 (stage 2 must be built)
+#
+#      all
+#              Same as bootstrap
+#
+#       install
+#              Install everything, including stage 2 compiler by default
+#              (override with stage=3, for example).
+#
+#      dist
+#              Make a source dist (WARNING: runs 'make distclean' first)
+#
+#      binary-dist
+#              Builds a binary distribution
+#
+#      hc-file-bundle
+#              Builds an HC-file bundle, for bootstrapping
+#
+#      clean, distclean, maintainer-clean
+#              Increasing levels of cleanliness
 #
 ############################################################################
 
 TOP=.
 include $(TOP)/mk/boilerplate.mk
 
-# find the projects that actually exist...
-ProjectsThatExist = $(filter $(patsubst %/, %, $(wildcard */)), $(AllProjects))
+#
+# Order is important! It's e.g. necessary to descend into include/
+# before the rest to have a config.h, etc.
+#
+# If we're booting from .hc files, swap the order
+# we descend into subdirs - to boot utils must be before driver.
+#
+.PHONY: stage1 stage2 stage3 bootstrap bootstrap2 bootstrap3
 
-# and filter only those that the user requested, if necessary
-ifeq "$(ProjectsToBuild)" ""
-SUBDIRS = $(ProjectsThatExist)
+# We can't 'make boot' in libraries until stage1 is built
+ifeq "$(BootingFromHc)" "YES"
+SUBDIRS_NOLIB = includes rts compat compiler docs utils driver
 else
-SUBDIRS = $(filter $(ProjectsToBuild), $(ProjectsThatExist))
+SUBDIRS_NOLIB = includes compat utils driver docs compiler rts
 endif
 
-ifneq "$(Project)" ""
-   include $(shell echo $(Project) | tr A-Z a-z)/mk/config.mk
-endif
+SUBDIRS = $(SUBDIRS_NOLIB) libraries
+
+# Sanity check that all the core libraries are in the tree, to catch
+# failure to run darcs-all.
+check-packages :
+       @for d in `cat libraries/core-packages`; do \
+         if test ! -d libraries/$$d; then \
+            echo "Looks like you're missing libraries/$$d,"; \
+            echo "maybe you haven't done 'sh darcs-all get'?"; \
+            exit 1; \
+         fi \
+       done
+
+stage1 : check-packages
+       $(MAKE) -C utils/mkdependC boot
+       @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
+       for i in $(SUBDIRS_NOLIB); do \
+         echo "------------------------------------------------------------------------"; \
+         echo "== $(MAKE) boot $(MFLAGS);"; \
+         echo " in $(shell pwd)/$$i"; \
+         echo "------------------------------------------------------------------------"; \
+         $(MAKE) --no-print-directory -C $$i $(MFLAGS) boot; \
+         if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+       done; \
+       for i in $(SUBDIRS_NOLIB); do \
+         echo "------------------------------------------------------------------------"; \
+         echo "== $(MAKE) all $(MFLAGS);"; \
+         echo " in $(shell pwd)/$$i"; \
+         echo "------------------------------------------------------------------------"; \
+         $(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \
+         if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+       done
+       @$(MAKE) -C libraries boot
+       @$(MAKE) -C libraries all
+
+stage2 : check-packages
+       $(MAKE) -C compiler boot stage=2
+       $(MAKE) -C compiler stage=2
+
+stage3 : check-packages
+       $(MAKE) -C compiler boot stage=3
+       $(MAKE) -C compiler stage=3
+
+bootstrap  : bootstrap2
+
+bootstrap2 : stage1
+       $(MAKE) stage2
+
+bootstrap3 : bootstrap2
+       $(MAKE) stage3
+
+all :: bootstrap
 
 # -----------------------------------------------------------------------------
-# Certain targets require that Project is set from the command line.
+# Installing
+
+# We want to install the stage 2 bootstrapped compiler by default, but we let
+# the user override this by saying 'make install stage=1', for example.
+ifeq "$(stage)" ""
+INSTALL_STAGE = stage=2
+else
+INSTALL_STAGE =
+endif
 
-CURRENT_TARGET = $(MAKECMDGOALS)
-project-check :
-       @if [ "$(Project)" = "" ]; then \
-               echo "  You need to set \"Project\" in order to make $(CURRENT_TARGET)"; \
-               echo "  eg. make $(CURRENT_TARGET) Project=Ghc"; \
-               exit 1; \
-       fi
+# Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
+install :: check-packages
+       @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
+       for i in $(SUBDIRS); do \
+         echo "------------------------------------------------------------------------"; \
+         echo "== $(MAKE) $@ $(MFLAGS);"; \
+         echo " in $(shell pwd)/$$i"; \
+         echo "------------------------------------------------------------------------"; \
+         $(MAKE) --no-print-directory -C $$i $(INSTALL_STAGE) $(MFLAGS) $@; \
+         if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+       done
+
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+# These files need to be in the InstallShield
+# INSTALL_DATAS rather than INSTALL_DOCS is used so these files go
+# in the top-level directory of the distribution
+INSTALL_DATAS += ANNOUNCE LICENSE README
+endif
+
+# If installing on Windows with MinGW32, copy the gcc compiler, headers and libs
+# and the perl interpreter and dll into the GHC prefix directory.
+# Gcc and Perl source locations derived from configuration data.
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(WhatGccIsCalled)" ""
+install ::
+       -mkdir $(prefix)/gcc-lib
+       -mkdir $(prefix)/include
+       -mkdir $(prefix)/include/mingw
+       -cp -rp $(GccDir)../include/* $(prefix)/include/mingw
+       -cp -rp $(GccDir)../lib/gcc-lib/mingw32/$(GccVersion)/* $(prefix)/gcc-lib
+       -cp -rp $(GccDir)../lib/gcc/mingw32/$(GccVersion)/* $(prefix)/gcc-lib
+       -cp -rp $(GccDir)../libexec/gcc/mingw32/$(GccVersion)/* $(prefix)/gcc-lib
+       -cp $(GccDir)../lib/*.* $(prefix)/gcc-lib
+       -cp $(GccDir)gcc.exe $(prefix)
+       -cp $(GccDir)as.exe $(prefix)/gcc-lib
+       -cp $(GccDir)ld.exe $(prefix)/gcc-lib
+       -cp $(GccDir)dllwrap.exe $(prefix)/gcc-lib
+       -cp $(GccDir)dlltool.exe $(prefix)/gcc-lib
+       -cp $(GhcDir)../perl.exe $(prefix)
+       -cp $(GhcDir)../perl56.dll $(prefix)
+endif
+endif
+
+install-docs ::
+       @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
+       for i in $(SUBDIRS); do \
+         echo "------------------------------------------------------------------------"; \
+         echo "== $(MAKE) $@ $(MFLAGS);"; \
+         echo " in $(shell pwd)/$$i"; \
+         echo "------------------------------------------------------------------------"; \
+         $(MAKE) --no-print-directory -C $$i $(INSTALL_STAGE) $(MFLAGS) $@; \
+         if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
+       done
 
 # -----------------------------------------------------------------------------
 # Making a binary distribution
 #
-# To make a particular binary distribution: 
-# set $(Project) to the name of the project, capitalised (eg. Ghc or Happy).
-
 # `dist' `binary-dist'
 #      Create a distribution tar file for this program. The tar file
 #      should be set up so that the file names in the tar file start with
@@ -57,52 +202,53 @@ project-check :
 #      that are in the distribution, to make sure they are up to date in
 #      the distribution. See Making Releases.
 #
-#      binary-dist is an FPtools addition for binary distributions
+#      binary-dist is a GHC addition for binary distributions
 # 
 
-binary-dist :: project-check
-
-BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
-BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs
+else
+BinDistShScripts =
+endif
 
-#
-# list of toplevel directories to include in binary distrib.
-#
-BIN_DIST_MAIN_DIR=$($(Project)MainDir)
-BIN_DIST_DIRS=$($(Project)BinDistDirs)
+BinDistPrlScripts = ghcprof
+BinDistLibPrlScripts = ghc-asm ghc-split
+BinDistBins = hp2ps runghc
+BinDistOptBins = runhaskell
+BinDistLinks = ghc ghci ghc-pkg
+BinDistLibSplicedFiles = package.conf
+BinDistDirs = includes compiler docs driver libraries rts utils
 
-binary-dist:: binary-dist-pre
+BIN_DIST_NAME=ghc-$(ProjectVersion)
+BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
 
 BIN_DIST_TOP= distrib/Makefile-bin.in \
-             distrib/configure-bin.in \
+             distrib/configure-bin.ac \
              distrib/INSTALL \
-             $(BIN_DIST_MAIN_DIR)/ANNOUNCE \
-             $(BIN_DIST_MAIN_DIR)/VERSION \
-             $(BIN_DIST_MAIN_DIR)/LICENSE \
-             $(BIN_DIST_MAIN_DIR)/README \
-             glafp-utils/mkdirhier/mkdirhier \
+             distrib/README \
+             ANNOUNCE \
+             LICENSE \
+             utils/mkdirhier/mkdirhier \
              install-sh \
              config.guess \
              config.sub   \
              aclocal.m4
 
-#
-# binary-dist creates a binary bundle, set BIN_DIST_NAME
-# to package name and do `make binary-dist Project=<project-name>'
-# (normally this just a thing you would do from the toplevel of fptools)
-#
+ifeq "$(darwin_TARGET_OS)" "1"
+BIN_DIST_TOP+=mk/fix_install_names.sh
+endif
+
 .PHONY: binary-dist-pre binary-dist binary-pack
 
-BIN_DIST_NAME=$(ProjectNameShort)-$(ProjectVersion)
-BIN_DIST_TMPDIR=$(FPTOOLS_TOP_ABS)
+binary-dist:: binary-dist-pre
 
 binary-dist-pre::
 ifeq "$(BIN_DIST)" ""
-       echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in your build.mk" && exit 1
+       @echo "WARNING: To run the binary-dist target, you need to set BIN_DIST=1 in mk/build.mk" && exit 1
 endif
        -rm -rf $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)
        -$(RM) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME).tar.gz
-       @for i in $(BIN_DIST_DIRS); do                   \
+       @for i in $(BinDistDirs); do                     \
          if test -d "$$i"; then                         \
           echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
           $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM); \
@@ -110,14 +256,14 @@ endif
           $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM); \
           echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
           $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-          echo $(MAKE) -C $$i $(MFLAGS) install \
+          echo $(MAKE) -C $$i $(MFLAGS) $(INSTALL_STAGE) install \
                prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
                exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
                bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
                libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
                libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
                datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-          $(MAKE) -C $$i $(MFLAGS) install \
+          $(MAKE) -C $$i $(MFLAGS) $(INSTALL_STAGE) install \
                prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
                exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
                bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
@@ -136,44 +282,57 @@ binary-dist::
        done;
        @echo "Configuring the Makefile for this project..."
        touch $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-       echo "package = $(ProjectNameShort)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "package = ghc" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        echo "version = $(ProjectVersion)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-       echo "PACKAGE_SH_SCRIPTS = $($(Project)BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-       echo "PACKAGE_PRL_SCRIPTS = $($(Project)BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-       echo "PACKAGE_LIB_PRL_SCRIPTS = $($(Project)BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-       echo "PACKAGE_BINS = $($(Project)BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
-       echo "PACKAGE_LINKS = $($(Project)BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_SH_SCRIPTS = $(BinDistShScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_PRL_SCRIPTS = $(BinDistPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_LIB_PRL_SCRIPTS = $(BinDistLibPrlScripts)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_LIB_SPLICED_FILES = $(BinDistLibSplicedFiles)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_BINS = $(BinDistBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_OPT_BINS = $(BinDistOptBins)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
+       echo "PACKAGE_LINKS = $(BinDistLinks)" >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        cat $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in >> $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in
        @echo "Generating a shippable configure script.."
-       $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
+       $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.ac $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.ac
        ( cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
-       if test -x $(BIN_DIST_MAIN_DIR)/mk/post-install-script ; then \
-               cp $(BIN_DIST_MAIN_DIR)/mk/post-install-script \
-                       $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
-       fi
-       if test -x $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script ; then \
-               cp $(BIN_DIST_MAIN_DIR)/mk/post-inplace-script \
-                       $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) ; \
-       fi
 #
 # binary dist'ing the documentation.  
-# Which documentation to build/install is hardcoded below.
-#
+# The default documentation to build/install is given below; overrideable
+# via build.mk or the 'make' command-line.
 
-BINDIST_DOC_WAYS = html ps
+ifndef BINDIST_DOC_WAYS
+
+ifneq "$(XSLTPROC)" ""
+BINDIST_DOC_WAYS = html
+ifneq "$(FOP)" ""
+BINDIST_DOC_WAYS += ps pdf
+else
+ifneq "$(PDFXMLTEX)" ""
+BINDIST_DOC_WAYS += pdf
+endif
+ifneq "$(XMLTEX)" ""
+ifneq "$(DVIPS)" ""
+BINDIST_DOC_WAYS += ps
+endif # DVIPS
+endif # XMLTEX
+endif # FOP
+endif # XSLTPROC
+
+endif # BINDIST_DOC_WAYS
 
 binary-dist ::
-       @for i in $(BIN_DIST_DIRS); do                          \
+ifneq "$(DIR_DOCBOOK_XSL)" ""
+       @for i in $(BinDistDirs); do                            \
          if test -d "$$i"; then                                \
            $(MAKE) -C $$i $(MFLAGS) $(BINDIST_DOC_WAYS);       \
-           echo $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="html ps" \
+           echo $(MAKE) -C $$i $(MFLAGS) install-docs XMLDocWays="$(BINDIST_DOC_WAYS)" \
                prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)      \
                exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
                bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
                libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
                libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM) \
                datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
-           $(MAKE) -C $$i $(MFLAGS) install-docs SGMLDocWays="html ps" \
+           $(MAKE) -C $$i $(MFLAGS) install-docs XMLDocWays="$(BINDIST_DOC_WAYS)" \
                prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)      \
                exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
                bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM) \
@@ -182,31 +341,34 @@ binary-dist ::
                datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share; \
          fi \
        done
+endif
 
 # Rename scripts to $i.prl and $i.sh where necessary.
 # ToDo: do this in a cleaner way...
 
-ifneq "$($(Project)BinDistPrlScripts)" ""
+ifneq "$(BinDistPrlScripts)" ""
 binary-dist::
-       @for i in $($(Project)BinDistPrlScripts); do \
+       @for i in $(BinDistPrlScripts); do \
             echo "Renaming $$i to $$i.prl"; \
            $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.prl; \
        done
 endif
 
-ifneq "$($(Project)BinDistLibPrlScripts)" ""
+ifneq "$(BinDistLibPrlScripts)" ""
 binary-dist::
-       @for i in $($(Project)BinDistLibPrlScripts); do \
+       @for i in $(BinDistLibPrlScripts); do \
             echo "Renaming $$i to $$i.prl"; \
            $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/$$i.prl; \
        done
 endif
 
-ifneq "$($(Project)BinDistShScripts)" ""
+ifneq "$(BinDistShScripts)" ""
 binary-dist::
-       @for i in $($(Project)BinDistShScripts); do \
-            echo "Renaming $$i to $$i.sh"; \
-           $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \
+       @for i in $(BinDistShScripts); do \
+           if test -x $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i ; then \
+               echo "Renaming $$i to $$i.sh"; \
+               $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/$$i.sh; \
+           fi \
        done
 endif
 
@@ -237,7 +399,7 @@ binary-dist::
 # Do it like this: 
 #
 #      $ make
-#      $ make dist Project=Ghc
+#      $ make dist
 #
 # WARNING: `make dist' calls `make distclean' before tarring up the tree.
 #
@@ -247,20 +409,20 @@ binary-dist::
 #
 # Directory in which we're going to build the src dist
 #
+SRC_DIST_NAME=ghc-$(ProjectVersion)
 SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS += docs distrib $(SUBDIRS)
+SRC_DIST_DIRS += docs distrib $(filter-out docs distrib,$(SUBDIRS))
 SRC_DIST_FILES += \
-       configure.in config.guess config.sub configure \
-       aclocal.m4 acconfig.h README Makefile Makefile.config install-sh \
-       mk/bootstrap.mk \
+       configure.ac config.guess config.sub configure \
+       aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
+       ghc.spec.in mk/bootstrap.mk \
        mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \
-       mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk
-
-dist dist-manifest dist-package :: project-check
+       mk/paths.mk mk/package.mk mk/suffix.mk mk/target.mk \
+       mk/fptools.css mk/fix_install_names.sh
 
 # clean the tree first, leaving certain extra files in place (eg. configure)
 dist :: distclean
@@ -270,8 +432,8 @@ dist ::
        -$(RM) $(SRC_DIST_NAME).tar.gz
        mkdir $(SRC_DIST_DIR)
        mkdir $(SRC_DIST_DIR)/mk
-       ( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) -type d \( -name CVS -prune -o -name SRC -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh )
-       ( cd $(FPTOOLS_TOP_ABS); $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name CVS -prune -o -name SRC -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh )
+       $(FIND) $(SRC_DIST_DIRS) -type d \( -name _darcs -prune -o -name SRC -prune -o -name "autom4te*" -prune -o -print \) | sed -e 's!.*!mkdir "$(SRC_DIST_DIR)/&"!' | sh
+       $(FIND) $(SRC_DIST_DIRS) $(SRC_DIST_FILES) -name _darcs -prune -o -name SRC -prune -o -name "autom4te*" -prune -o -name "*~" -prune -o -name ".cvsignore" -prune -o -name "\#*" -prune -o -name ".\#*" -prune -o -name "log" -prune -o -name "*-SAVE" -prune -o -name "*.orig" -prune -o -name "*.rej" -prune -o ! -type d -print | sed -e 's!.*!$(LN_S) "$(FPTOOLS_TOP_ABS)/&" "$(SRC_DIST_DIR)/&"!' | sh
 
 # Automatic generation of a MANIFEST file for a source distribution
 # tree that is ready to go.
@@ -282,8 +444,11 @@ dist-package :: dist-package-tar-gz
 
 SRC_DIST_PATHS = $(patsubst %, $(SRC_DIST_NAME)/%, $(SRC_DIST_FILES) $(SRC_DIST_DIRS))
 
+dist-package-tar-bz2 ::
+       BZIP2=-9 $(TAR) chjf $(SRC_DIST_NAME)-src.tar.bz2 $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.bz2
+
 dist-package-tar-gz ::
-       $(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME)
+       $(TAR) chzf $(SRC_DIST_NAME)-src.tar.gz $(SRC_DIST_NAME) || $(RM) $(SRC_DIST_NAME)-src.tar.gz
 
 dist-package-zip ::
        cd ..; $(LN_S) $(FPTOOLS_TOP_ABS) $(SRC_DIST_NAME) && \
@@ -292,88 +457,46 @@ dist-package-zip ::
 # -----------------------------------------------------------------------------
 # HC file bundles
 
-hc-file-bundle : project-check
-       $(RM) -r $(ProjectNameShort)-$(ProjectVersion)
-       $(LN_S) . $(ProjectNameShort)-$(ProjectVersion)
-       $(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler \
-            $(ProjectNameShort)-$(ProjectVersion)/ghc/driver \
-            $(ProjectNameShort)-$(ProjectVersion)/libraries \
-            $(ProjectNameShort)-$(ProjectVersion)/hslibs \
+hc-file-bundle :
+       $(RM) -r ghc-$(ProjectVersion)
+       $(LN_S) . ghc-$(ProjectVersion)
+       $(FIND) ghc-$(ProjectVersion)/compiler \
+            ghc-$(ProjectVersion)/utils \
+            ghc-$(ProjectVersion)/compat \
+            ghc-$(ProjectVersion)/libraries -follow \
          \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
-       for f in `$(FIND) $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler $(ProjectNameShort)-$(ProjectVersion)/ghc/driver $(ProjectNameShort)-$(ProjectVersion)/libraries $(ProjectNameShort)-$(ProjectVersion)/hslibs -name "*.hsc" -print` ""; do \
+       for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/utils ghc-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \
             if test "x$$f" != "x" && test -e `echo "$$f" | sed 's/hsc$$/hs/g'`; then \
                echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
             fi; \
        done;
-       echo $(ProjectNameShort)-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/*.hs-incl >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/Parser.hs >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/parser/ParserCore.hs >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/ghc/compiler/main/ParsePkgConf.hs >> hc-files-to-go
-       echo $(ProjectNameShort)-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go
-       tar czf $(ProjectNameShort)-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
-
-CLEAN_FILES += hc-files-to-go *-hc.tar.gz
+       for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/rts -name "*.cmm" -follow -print` ""; do \
+            if test "x$$f" != "x"; then \
+               echo `echo "$$f" | sed 's/cmm$$/hc/g' ` >> hc-files-to-go ; \
+            fi; \
+       done;
+       echo ghc-$(ProjectVersion)/libraries/base/GHC/PrimopWrappers.hs >> hc-files-to-go
+       echo ghc-$(ProjectVersion)/compiler/parser/Parser.hs >> hc-files-to-go
+       echo ghc-$(ProjectVersion)/compiler/parser/ParserCore.hs >> hc-files-to-go
+       echo ghc-$(ProjectVersion)/compiler/main/ParsePkgConf.hs >> hc-files-to-go
+       echo ghc-$(ProjectVersion)/libraries/haskell-src/Language/Haskell/Parser.hs >> hc-files-to-go
+       tar czf ghc-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
 
 # -----------------------------------------------------------------------------
+# Cleaning
 
-DIST_CLEAN_FILES += config.cache config.status
-
-#
-# If you've ended up using an in-place version of Happy,
-# make sure it gets built early on.
-#
-ifeq "$(HAPPY)" "$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace"
-all :: $(FPTOOLS_TOP_ABS)/happy/src/happy-inplace
-
-$(FPTOOLS_TOP_ABS)/happy/src/happy-inplace : glafp-utils
-       $(MAKE) -C happy boot all
-endif
-
-all ::
-       @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-       for i in $(SUBDIRS); do \
-          if [ -d $$i ]; then \
-             $(MAKE) -C $$i boot; \
-             if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-             $(MAKE) -C $$i all; \
-             if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-             fi; \
-       done
-
-boot ::
-       @echo "Please use \`make all' only from the top-level, or \`make boot' followed"
-       @echo "by \`make all' in an individual project subdirectory (ghc, hslibs etc.)."
+CLEAN_FILES += hc-files-to-go *-hc.tar.gz
 
-bootstrap : bootstrap2
-bootstrap2 : all stage2
-bootstrap3 : bootstrap2 stage3
+DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \
+       ghc.spec docs/users_guide/ug-book.xml
 
-stage2 :
-       $(MAKE) -C ghc/compiler boot stage=2
-       $(MAKE) -C ghc/compiler stage=2
+# don't clean config.mk: it's needed when cleaning stuff later on
+LATE_DIST_CLEAN_FILES += mk/config.mk 
 
-stage3 :
-       $(MAKE) -C ghc/compiler boot stage=3
-       $(MAKE) -C ghc/compiler stage=3
+extraclean::
+       $(RM) -rf autom4te.cache
 
-install ::
-       @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-       for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
-          if [ -d $$i ]; then \
-             $(MAKE) -C $$i install; \
-             if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-             fi; \
-       done
-
-install-docs ::
-       @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-       for i in $(filter-out $(ProjectsDontInstall), $(SUBDIRS)); do \
-          if [ -d $$i ]; then \
-             $(MAKE) -C $$i install-docs; \
-             if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ;  then true; else exit 1; fi; \
-             fi; \
-       done
+# -----------------------------------------------------------------------------
 
 # Turn off target.mk's rules for 'all', 'boot' and 'install'.
 NO_BOOT_TARGET=YES