Fix an nasty black hole, concerning computation of isRecursiveTyCon
[ghc-hetmet.git] / Makefile
index 41e09dd..14af874 100644 (file)
--- a/Makefile
+++ b/Makefile
 #      binary-dist
 #              Builds a binary distribution
 #
+#      framework-pkg  [MacOS only]
+#              Builds /Library/Frameworks/GHC.framework wrapped into a Mac
+#              installer package
+#
+#      framework-binary-dist  [MacOS only]
+#              Builds GHC.framework encapsulating a binary distribution
+#              (to give a relocatable framework)
+#
 #      hc-file-bundle
 #              Builds an HC-file bundle, for bootstrapping
 #
@@ -59,20 +67,22 @@ include $(TOP)/mk/boilerplate.mk
 
 # We can't 'make boot' in libraries until stage1 is built
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_BUILD = gmp includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = includes compiler docs utils driver
 else
-SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts libraries/Cabal/doc
+SUBDIRS_BUILD = includes utils driver docs compiler libraries/Cabal/doc
 endif
 
-SUBDIRS = gmp includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
+SUBDIRS = gmp libffi includes utils docs rts compiler ghc driver libraries libraries/Cabal/doc
+
+check-all: check-packages check-tools
 
 # Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
 check-packages :
-       @ds=`cat libraries/boot-packages`;\
+       @ds=`grep "^[^# ][^ ]*  *[^ ][^ ]*  *[^ ][^ ]*$$" packages | sed "s/ .*//"`;\
        for d in $$ds; do \
-         if test ! -d libraries/$$d; then \
-            echo "Looks like you're missing libraries/$$d,"; \
+         if test ! -d $$d; then \
+            echo "Looks like you're missing $$d,"; \
             echo "maybe you haven't done './darcs-all get'?"; \
             exit 1; \
          fi \
@@ -83,14 +93,32 @@ check-packages :
            exit 1; \
        fi
 
+HAVE_EVAL := NO
+$(eval HAVE_EVAL := YES)
+
+check-tools:
+ifeq "$(HSCOLOUR_SRCS) $(HSCOLOUR)" "YES "
+       @echo "HsColour needed but wasn't found."
+       @echo "Set HSCOLOUR_SRCS=NO if you don't want to use it"
+       exit 1
+endif
+ifeq "$(HAVE_EVAL)" "NO"
+       @echo "Your make doesn't support eval. You need GNU make >= 3.80"
+       exit 1
+endif
+       @:
+
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 ifneq "$(WhatGccIsCalled)" ""
 GCC_LIB_DEP = stamp.inplace-gcc-lib
 endif
 endif
 
-stage1 : $(GCC_LIB_DEP) check-packages
+stage1 : $(GCC_LIB_DEP) check-all
+       $(MAKE) -C libraries boot
+       $(MAKE) -C gmp       all
        $(MAKE) -C utils/mkdependC boot
+       $(MAKE) -C utils with-bootstrapping-compiler
        @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
        for i in $(SUBDIRS_BUILD); do \
          echo "------------------------------------------------------------------------"; \
@@ -108,15 +136,30 @@ stage1 : $(GCC_LIB_DEP) check-packages
          $(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 libffi    all
+       $(MAKE) -C rts boot
+       $(MAKE) -C rts
        $(MAKE) -C libraries all
 
-stage2 : check-packages
-       $(MAKE) -C compiler boot stage=2
+# When making distributions (i.e., whether with binary-dist or using the 
+# vanilla install target to create an installer package), we can have problems
+# if some things (e.g. ghc-pkg) are compiled with the bootstrapping compiler 
+# and some (e.g. the stage 2 compiler) with the stage1 compiler. See #1860 for
+# an example.  Thus, we explicitly build a second version with the stage 1 
+# compiler of all utils that get installed and of all extra support binaries
+# includes in binary dists.
+stage2 : check-all
+       $(MAKE) -C compiler stage=2 boot
        $(MAKE) -C compiler stage=2
+       $(MAKE) -C utils with-stage-2
+       $(MAKE) -C libraries stage=2 all
+ifeq "$(HADDOCK_DOCS)" "YES"
+       $(MAKE) -C libraries doc
+       $(MAKE) -C compiler  doc stage=2
+endif
 
-stage3 : check-packages
-       $(MAKE) -C compiler boot stage=3
+stage3 : check-all
+       $(MAKE) -C compiler stage=3 boot
        $(MAKE) -C compiler stage=3
 
 bootstrap  : bootstrap2
@@ -138,13 +181,13 @@ all :: stamp.inplace-gcc-lib
 # tree somewhere, and then have install copy it from there rather than
 # from the filesystem.
 stamp.inplace-gcc-lib:
-       $(RM) -r compiler/gcc-lib
-       mkdir compiler/gcc-lib
-       cp $(LD) compiler/gcc-lib
+       $(RM) -r ghc/gcc-lib
+       mkdir ghc/gcc-lib
+       cp $(LD) ghc/gcc-lib
        touch $@
 
 clean ::
-       $(RM) -r compiler/gcc-lib
+       $(RM) -r ghc/gcc-lib
        $(RM) -f inplace-gcc-lib
 endif
 endif
@@ -167,6 +210,8 @@ install-strip:
 
 # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
 install :: check-packages
+       $(MKDIRHIER) $(DESTDIR)$(datadir)
+       echo "[]" > $(DESTDIR)$(datadir)/package.conf
        @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 "------------------------------------------------------------------------"; \
@@ -249,17 +294,7 @@ install-docs ::
 
 binary-dist::
        -rm -rf $(BIN_DIST_DIR)
-       -$(RM) $(BIN_DIST_DIR).tar.gz
-
-# When making bindists, we can have problems if some things (e.g. ghc-pkg)
-# are compiled with the bootstrapping compiler and some (e.g. the stage 2
-# compiler) with the stage1 compiler. See #1860 for an example.
-# Thus we rebuild the utils with stage 1 here. This is a bit unpleasant,
-# as binary-dist really shouldn't actually build anything, but it works.
-binary-dist::
-       $(MAKE) -C utils clean
-       $(MAKE) -C utils UseStage1=YES boot
-       $(MAKE) -C utils UseStage1=YES
+       -$(RM) $(BIN_DIST_TAR_BZ2)
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
@@ -268,101 +303,121 @@ binary-dist::
        $(MAKE) prefix=$(BIN_DIST_DIR) install-docs
 
 binary-dist::
-       cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
+       cd $(BIN_DIST_DIR) && $(SHELL) ../distrib/prep-bin-dist-mingw
 
 binary-dist::
        $(MKDIRHIER) $(BIN_DIST_DIR)/icons
        cp distrib/hsicon.ico $(BIN_DIST_DIR)/icons
 
-else
-
-BinDistDirs = includes compiler docs rts
-
-BIN_DIST_TOP= distrib/Makefile \
-              distrib/configure-bin.ac \
-              distrib/INSTALL \
-              distrib/README \
-              ANNOUNCE \
-              LICENSE \
-              install-sh \
-              extra-gcc-opts.in \
-              config.guess \
-              config.sub   \
-              aclocal.m4
+# Tar up the distribution and build a manifest
+binary-dist :: tar-binary-dist
 
-ifeq "$(darwin_TARGET_OS)" "1"
-BIN_DIST_TOP+=mk/fix_install_names.sh
-endif
+.PHONY: tar-binary-dist
+tar-binary-dist:
+       ( cd $(BIN_DIST_TOPDIR_ABS); $(TAR) cf - $(BIN_DIST_NAME) | bzip2 > $(FPTOOLS_TOP_ABS)/$(BIN_DIST_TAR_BZ2) )
+       ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(FPTOOLS_TOP_ABS)/$(BIN_DIST_TAR_BZ2) | $(TAR) tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
 
-.PHONY: binary-dist-pre% binary-dist binary-pack
+else
 
-binary-dist:: binary-dist-pre
+.PHONY: binary-dist
 
-binary-dist-pre::
-       $(MKDIRHIER) $(BIN_DIST_DIR)/mk
-       echo 'include $$(TOP)/Makefile-vars' >  $(BIN_DIST_DIR)/mk/boilerplate.mk
-       echo 'include $$(TOP)/mk/package.mk' >  $(BIN_DIST_DIR)/mk/target.mk
-       echo 'include $$(TOP)/mk/install.mk' >> $(BIN_DIST_DIR)/mk/target.mk
-       echo 'include $$(TOP)/mk/recurse.mk' >> $(BIN_DIST_DIR)/mk/target.mk
-       echo ''                              >  $(BIN_DIST_DIR)/mk/compat.mk
-       cp mk/package.mk $(BIN_DIST_DIR)/mk/
-       cp mk/install.mk $(BIN_DIST_DIR)/mk/
-       cp mk/recurse.mk $(BIN_DIST_DIR)/mk/
-       cp mk/fptools.css $(BIN_DIST_DIR)/mk/
-       $(MKDIRHIER) $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM)
-       $(MKDIRHIER) $(BIN_DIST_DIR)/share
+BIN_DIST_VARFILE=$(BIN_DIST_PREP)/Makefile-vars.in
 
-binary-dist::
-       $(MAKE) -C gmp       binary-dist DOING_BIN_DIST=YES
-       $(MAKE) -C includes  binary-dist DOING_BIN_DIST=YES
-       $(MAKE) -C compiler  binary-dist DOING_BIN_DIST=YES $(INSTALL_STAGE)
-       $(MAKE) -C rts       binary-dist DOING_BIN_DIST=YES
-       $(MAKE) -C driver    binary-dist DOING_BIN_DIST=YES
-       $(MAKE) -C utils     binary-dist DOING_BIN_DIST=YES
-       $(MAKE) -C docs      binary-dist DOING_BIN_DIST=YES
-       $(MAKE) -C libraries binary-dist DOING_BIN_DIST=YES
-       $(MAKE) -C libraries/Cabal/doc binary-dist DOING_BIN_DIST=YES
-
-VARFILE=$(BIN_DIST_DIR)/Makefile-vars.in
+WHERE_AM_I = $(BIN_DIST_NAME)
 
 binary-dist::
-       @for i in $(BIN_DIST_TOP); do \
-         if test -f "$$i"; then \
-            echo cp $$i $(BIN_DIST_DIR); \
-            cp $$i $(BIN_DIST_DIR); \
-         fi; \
-       done;
-       @echo "Configuring the Makefile for this project..."
-       echo                                                         >  $(VARFILE)
-       echo "package = ghc"                                         >> $(VARFILE)
-       echo "version = $(ProjectVersion)"                           >> $(VARFILE)
-       echo "ProjectVersion = $(ProjectVersion)"                    >> $(VARFILE)
-       echo "HaveLibGmp = $(HaveLibGmp)"                            >> $(VARFILE)
-       echo "GhcLibsWithUnix = $(GhcLibsWithUnix)"                  >> $(VARFILE)
-       echo "GhcWithInterpreter = $(GhcWithInterpreter)"            >> $(VARFILE)
-       echo "GhcHasReadline = $(GhcHasReadline)"                    >> $(VARFILE)
-       echo "BootingFromHc = $(BootingFromHc)"                      >> $(VARFILE)
-       echo "XMLDocWays = $(XMLDocWays)"                            >> $(VARFILE)
-       # We won't actually use xsltproc, but we need to know if it's "" or not
-       echo "XSLTPROC = $(XSLTPROC)"                                >> $(VARFILE)
-       echo "TARGETPLATFORM = $(TARGETPLATFORM)"                    >> $(VARFILE)
-       echo "HADDOCK_DOCS = $(HADDOCK_DOCS)"                        >> $(VARFILE)
-
-       cat distrib/Makefile-bin-vars.in                             >> $(VARFILE)
-       @echo "Generating a shippable configure script.."
-       $(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
-       ( cd $(BIN_DIST_DIR); autoreconf )
+# For the most part we will be putting filenames in $(BIN_DIST_LIST),
+# and telling tar to tar all of those files up. So to start with we
+# remove $(BIN_DIST_LIST) so that we can start with an empty slate
+       $(RM) -f $(BIN_DIST_LIST)
+# Now we add a few files from mk/ to $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/mk/package.mk     >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/mk/install.mk     >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/mk/recurse.mk     >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/mk/cabal.mk       >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/mk/cabal-flags.mk >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/mk/fptools.css    >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/ANNOUNCE          >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/LICENSE           >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/install-sh        >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/extra-gcc-opts.in >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/config.guess      >> $(BIN_DIST_LIST)
+       echo $(WHERE_AM_I)/config.sub        >> $(BIN_DIST_LIST)
+# Now we recurse into various subdirectories and tell them to add and
+# files that they want into $(BIN_DIST_LIST)
+# XXX Ug, this duplication of "-C foo WHERE_AM_I=.../foo" isn't nice.
+       $(MAKE) -C gmp                 binary-dist WHERE_AM_I=$(WHERE_AM_I)/gmp
+       $(MAKE) -C includes            binary-dist WHERE_AM_I=$(WHERE_AM_I)/includes
+       $(MAKE) -C compiler            binary-dist WHERE_AM_I=$(WHERE_AM_I)/compiler $(INSTALL_STAGE)
+       $(MAKE) -C ghc                 binary-dist WHERE_AM_I=$(WHERE_AM_I)/ghc      $(INSTALL_STAGE)
+       $(MAKE) -C rts                 binary-dist WHERE_AM_I=$(WHERE_AM_I)/rts
+       $(MAKE) -C driver              binary-dist WHERE_AM_I=$(WHERE_AM_I)/driver
+       $(MAKE) -C utils               binary-dist WHERE_AM_I=$(WHERE_AM_I)/utils
+       $(MAKE) -C docs                binary-dist WHERE_AM_I=$(WHERE_AM_I)/docs
+       $(MAKE) -C libffi              binary-dist WHERE_AM_I=$(WHERE_AM_I)/libffi
+       $(MAKE) -C libraries           binary-dist WHERE_AM_I=$(WHERE_AM_I)/libraries
+       $(MAKE) -C libraries/Cabal/doc binary-dist WHERE_AM_I=$(WHERE_AM_I)/libraries/Cabal/doc
+# Now thinks get messier. Some files we need to move around, rename or
+# generate. We do this under $(BIN_DIST_PREP).
+       $(RM) -rf    $(BIN_DIST_PREP_DIR)
+       $(MKDIRHIER) $(BIN_DIST_PREP)/mk
+       echo 'include $$(TOP)/Makefile-vars' >  $(BIN_DIST_PREP)/mk/boilerplate.mk
+       echo 'include $$(TOP)/mk/package.mk' >  $(BIN_DIST_PREP)/mk/target.mk
+       echo 'include $$(TOP)/mk/install.mk' >> $(BIN_DIST_PREP)/mk/target.mk
+       echo 'include $$(TOP)/mk/recurse.mk' >> $(BIN_DIST_PREP)/mk/target.mk
+       touch                                   $(BIN_DIST_PREP)/mk/bindist.mk
+ifeq "$(darwin_TARGET_OS)" "1"
+       cp mk/fix_install_names.sh $(BIN_DIST_PREP)/mk
 endif
 
-# Tar up the distribution and build a manifest
-binary-dist :: tar-binary-dist
-
-.PHONY: tar-binary-dist
-tar-binary-dist:
-       ( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 >$(BIN_DIST_TARBALL) )
-       ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >bin-manifest-$(ProjectVersion) )
+       cp distrib/Makefile         $(BIN_DIST_PREP)
+       cp distrib/INSTALL          $(BIN_DIST_PREP)
+       cp distrib/README           $(BIN_DIST_PREP)
+       cp distrib/configure-bin.ac $(BIN_DIST_PREP)/configure.ac
+# We can't just list aclocal.m4 in $(BIN_DIST_LIST), as it needs to be
+# next to configure.ac when we run autoreconf
+       cp aclocal.m4               $(BIN_DIST_PREP)
+       cd $(BIN_DIST_PREP) && autoreconf
+# We need to copy the pwd program that was built with stage1 to where
+# the build system expects to find it, i.e. the location the pwd built
+# with the bootstrapping compiler normally occupies
+       $(MKDIRHIER) $(BIN_DIST_PREP)/utils/pwd
+       cp utils/pwd/dist-install/build/pwd/pwd $(BIN_DIST_PREP)/utils/pwd
+# And likewise the installPackage program
+       $(MKDIRHIER) $(BIN_DIST_PREP)/utils/installPackage/install-inplace/bin
+       cp utils/installPackage/dist-install/build/installPackage/installPackage \
+          $(BIN_DIST_PREP)/utils/installPackage/install-inplace/bin
+
+       echo "package = ghc"                              >> $(BIN_DIST_VARFILE)
+       echo "version = $(ProjectVersion)"                >> $(BIN_DIST_VARFILE)
+       echo "ProjectVersion = $(ProjectVersion)"         >> $(BIN_DIST_VARFILE)
+       echo "HaveLibGmp = $(HaveLibGmp)"                 >> $(BIN_DIST_VARFILE)
+       echo "GhcLibsWithUnix = $(GhcLibsWithUnix)"       >> $(BIN_DIST_VARFILE)
+       echo "GhcWithInterpreter = $(GhcWithInterpreter)" >> $(BIN_DIST_VARFILE)
+       echo "GhcHasEditline = $(GhcHasEditline)"         >> $(BIN_DIST_VARFILE)
+       echo "BootingFromHc = $(BootingFromHc)"           >> $(BIN_DIST_VARFILE)
+       echo "XMLDocWays = $(XMLDocWays)"                 >> $(BIN_DIST_VARFILE)
+# We won't actually use xsltproc, but we need to know if it's "" or not
+       echo "XSLTPROC = $(XSLTPROC)"                     >> $(BIN_DIST_VARFILE)
+       echo "TARGETPLATFORM = $(TARGETPLATFORM)"         >> $(BIN_DIST_VARFILE)
+       echo "HADDOCK_DOCS = $(HADDOCK_DOCS)"             >> $(BIN_DIST_VARFILE)
+       echo "LATEX_DOCS = $(LATEX_DOCS)"                 >> $(BIN_DIST_VARFILE)
+       echo "INTEGER_LIBRARY = $(INTEGER_LIBRARY)"       >> $(BIN_DIST_VARFILE)
+       cat distrib/Makefile-bin-vars.in                  >> $(BIN_DIST_VARFILE)
+
+# With that done, we can now build the actual tarball
+
+       $(RM) -f $(BIN_DIST_NAME)
+       ln -s . $(BIN_DIST_NAME)
+# h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source
+# tree then we want to include the real file, not a symlink to it
+       $(TAR) hcf $(BIN_DIST_TAR) -T $(BIN_DIST_LIST)
+       cd $(BIN_DIST_PREP_DIR) && $(TAR) rf ../$(BIN_DIST_TAR) $(BIN_DIST_NAME)
+       bzip2 < $(BIN_DIST_TAR) > $(BIN_DIST_TAR_BZ2)
+       $(TAR) tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion)
+endif
 
-PUBLISH_FILES = $(BIN_DIST_TARBALL)
+PUBLISH_FILES = $(BIN_DIST_TAR_BZ2)
 
 # Upload the distribution and documentation
 ifneq "$(ISCC)" ""
@@ -380,21 +435,21 @@ endif
 
 # Upload the distribution and documentation
 ifneq "$(PublishLocation)" ""
-publish :: publish-binary-dist
+publish ::
+       make publish-binary-dist 'prefix=$(BIN_DIST_INST_DIR)'
 endif
 
+nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done
+
 .PHONY: publish-binary-dist
 publish-binary-dist ::
-       @for f in $(PUBLISH_FILES); do \
-           for i in 0 1 2 3 4 5 6 7 8 9; do \
-               echo "Try $$i: $(PublishCp) $$f $(PublishLocation)/dist"; \
-               if $(PublishCp) $$f $(PublishLocation)/dist; then break; fi; \
-           done \
+       @for f in $(PUBLISH_FILES); \
+           do $(call nTimes,10,$(PublishCp) $$f $(PublishLocation)/dist); \
        done
 
-# You need to first make binddisttest, and then run
-#     make publish 'prefix=$(BIN_DIST_INST_DIR)'
-# for this to find the right place.
+# You need to "make binddisttest" before publishing the docs, as it
+# works by publish setting $(prefix) to inside the binddisttest
+# directory so $(docdir) points to the right place.
 
 # We assume that Windows means Cygwin, as we can't just use docdir
 # unchanged or rsync (really SSH?) thinks that c:/foo means /foo on
@@ -407,12 +462,35 @@ PUBLISH_DOCDIR = $(docdir)
 endif
 
 publish-binary-dist ::
-       $(PublishCp) -r $(PUBLISH_DOCDIR)/* $(PublishLocation)/docs
+       $(call nTimes,10,$(PublishCp) -r "$(PUBLISH_DOCDIR)"/* $(PublishLocation)/docs)
 
 binary-dist::
        @echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"
 
 # -----------------------------------------------------------------------------
+# Building MacOS installer packages
+#
+# 'framework-pkg'
+#      Create an installer package for /Library/Frameworks/GHC.framework
+#
+# 'framework-binary-dist'
+#      Create an installer package for GHC.framework encapsulating a
+#      binary-dist to make it relocatable
+#      FIXME: This is only partially implemented so far
+
+ifeq "$(darwin_TARGET_OS)" "1"
+
+.PHONY: framework-pkg framework-binary-dist
+
+framework-pkg:
+       $(MAKE) -C distrib/MacOS framework-pkg
+
+framework-binary-dist:
+       $(MAKE) -C distrib/MacOS framework-binary-dist
+
+endif
+
+# -----------------------------------------------------------------------------
 # Building source distributions
 #
 # Do it like this: 
@@ -438,7 +516,7 @@ SRC_DIST_DIRS += mk docs distrib bindisttest $(filter-out docs distrib libraries
 SRC_DIST_FILES += \
        configure.ac config.guess config.sub configure \
        aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
-       ghc.spec.in extra-gcc-opts.in VERSION boot
+       ghc.spec.in ghc.spec extra-gcc-opts.in VERSION boot
 
 # -----------------------------------------------------------------------------
 # Source distributions
@@ -453,7 +531,7 @@ SRC_DIST_FILES += \
 #   - remove a bunch of other files that we know shouldn't be in the dist
 #   - tar up first the extralibs package, then the main source package
 
-EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/libraries/%, $(shell cat libraries/extra-packages))
+EXTRA_LIBS=$(patsubst %, $(SRC_DIST_NAME)/%, $(shell grep -E "extralibs|dph" packages | grep -v "^\#" | sed "s/ .*//"))
 
 SRC_DIST_TARBALL = ghc-$(ProjectVersion)-src.tar.bz2
 SRC_DIST_EXTRALIBS_TARBALL = ghc-$(ProjectVersion)-src-extralibs.tar.bz2
@@ -463,6 +541,24 @@ VERSION :
 
 dist :: VERSION
 
+# Use:
+#     $(call copy_generated_compiler_file,cmm,CmmLex,x)
+# to copy the generated file that replaces compiler/cmm/CmmLex.x
+# XXX Should this be unconditional? Do we want to support making a src dist
+# from an unbuilt tree?
+copy_generated_compiler_file = \
+  if test -f $(FPTOOLS_TOP_ABS)/compiler/dist-stage2/build/$2.hs; \
+  then \
+    $(CP) $(FPTOOLS_TOP_ABS)/compiler/dist-stage2/build/$2.hs compiler/$1/ ; \
+    mv compiler/$1/$2.$3 compiler/$1/$2.$3.source ; \
+  fi
+copy_generated_util_file = \
+  if test -f $(FPTOOLS_TOP_ABS)/utils/$1/dist-install/build/$1/$1-tmp/$2.hs; \
+  then \
+    $(CP) $(FPTOOLS_TOP_ABS)/utils/$1/dist-install/build/$1/$1-tmp/$2.hs utils/$1/ ; \
+    mv utils/$1/$2.$3 utils/$1/$2.$3.source ; \
+  fi
+
 dist ::
        $(RM) -rf $(SRC_DIST_DIR)
        $(RM) $(SRC_DIST_NAME).tar.gz
@@ -472,12 +568,21 @@ dist ::
          && for i in $(SRC_DIST_FILES); do $(LN_S) $(FPTOOLS_TOP_ABS)/$$i .; done \
          && $(MAKE) distclean \
          && if test -f $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; mv libraries/haskell-src/Language/Haskell/Parser.ly libraries/haskell-src/Language/Haskell/Parser.ly.source ; fi \
+         && $(call copy_generated_compiler_file,cmm,CmmLex,x) \
+         && $(call copy_generated_compiler_file,cmm,CmmParse,y) \
+         && $(call copy_generated_compiler_file,main,ParsePkgConf,y) \
+         && $(call copy_generated_compiler_file,parser,HaddockLex,x) \
+         && $(call copy_generated_compiler_file,parser,HaddockParse,y) \
+         && $(call copy_generated_compiler_file,parser,Lexer,x) \
+         && $(call copy_generated_compiler_file,parser,Parser,y.pp) \
+         && $(call copy_generated_compiler_file,parser,ParserCore,y) \
+         && $(call copy_generated_util_file,hpc,HpcParser,y) \
          && $(RM) -rf compiler/stage[123] mk/build.mk \
          && $(FIND) $(SRC_DIST_DIRS) \( -name _darcs -o -name SRC -o -name "autom4te*" -o -name "*~" -o -name ".cvsignore" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | xargs $(RM) -rf \
        )
-       tar chf - $(EXTRA_LIBS) | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_EXTRALIBS_TARBALL)
+       $(TAR) chf - $(EXTRA_LIBS) | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_EXTRALIBS_TARBALL)
        $(RM) -rf $(EXTRA_LIBS)
-       tar chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_TARBALL)
+       $(TAR) chf - $(SRC_DIST_NAME) 2>$src_log | bzip2 >$(FPTOOLS_TOP_ABS)/$(SRC_DIST_TARBALL)
 
 # Upload the distribution(s)
 # Retrying is to work around buggy firewalls that corrupt large file transfers
@@ -486,11 +591,11 @@ ifneq "$(PublishLocation)" ""
 dist ::
        @for i in 0 1 2 3 4 5 6 7 8 9; do \
                echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist"; \
-               if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi\
+               if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi; \
        done
        @for i in 0 1 2 3 4 5 6 7 8 9; do \
                echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist"; \
-               if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi\
+               if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi; \
        done
 endif
 
@@ -502,11 +607,10 @@ hc-file-bundle :
        $(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) 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 \
+            if test "x$$f" != "x" && test -f `echo "$$f" | sed 's/hsc$$/hs/g'`; then \
                echo `echo "$$f" | sed 's/hsc$$/hs/g' ` >> hc-files-to-go ; \
             fi; \
        done;
@@ -520,7 +624,7 @@ hc-file-bundle :
        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`
+       $(TAR) czf ghc-$(ProjectVersion)-$(TARGETPLATFORM)-hc.tar.gz `cat hc-files-to-go`
 
 # -----------------------------------------------------------------------------
 # Cleaning
@@ -528,10 +632,10 @@ hc-file-bundle :
 CLEAN_FILES += hc-files-to-go *-hc.tar.gz
 
 DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \
-       ghc.spec docs/users_guide/ug-book.xml extra-gcc-opts
+       docs/users_guide/ug-book.xml extra-gcc-opts
 
 # don't clean config.mk: it's needed when cleaning stuff later on
-LATE_DIST_CLEAN_FILES += mk/config.mk 
+LATE_DIST_CLEAN_FILES += mk/config.mk mk/are-validating.mk
 
 # VERSION is shipped in a source dist
 MAINTAINER_CLEAN_FILES += VERSION
@@ -540,6 +644,9 @@ extraclean::
        $(RM) -rf autom4te.cache
 
 clean distclean ::
+       $(RM) -rf inplace-datadir
+
+clean distclean ::
        $(MAKE) -C bindisttest $@
        if test -d testsuite; then $(MAKE) -C testsuite $@; fi