Change how we know whether or not we are validating
[ghc.git] / Makefile
index 73443f6..7adec86 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,20 +67,31 @@ 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 driver docs rts compiler ghc libraries libraries/Cabal/doc
+
+check-all: check-tools check-packages
+
+check-tools:
+       @:
+ifeq "$(HADDOCK_DOCS)" "YES"
+ifeq "$(HADDOCK)"      ""
+       echo "Couldn't find haddock" >&2
+       exit 1
+endif
+endif
 
 # 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 \
@@ -97,9 +108,12 @@ GCC_LIB_DEP = stamp.inplace-gcc-lib
 endif
 endif
 
-stage1 : $(GCC_LIB_DEP) check-packages
-       $(MAKE) -C utils mostlyclean
+stage1 : $(GCC_LIB_DEP) check-all
+       $(MAKE) -C libraries boot
+       $(MAKE) -C gmp       all
+       $(MAKE) -C libffi    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 "------------------------------------------------------------------------"; \
@@ -117,8 +131,10 @@ 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 rts boot
+       $(MAKE) -C rts
        $(MAKE) -C libraries all
+       $(MAKE) -C utils with-stage-1
 
 # When making distributions (i.e., whether with binary-dist or using the 
 # vanilla install target to create an installer package), we can have problems
@@ -127,19 +143,15 @@ stage1 : $(GCC_LIB_DEP) check-packages
 # 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-packages
-       $(MAKE) -C utils mostlyclean
-       $(MAKE) -C utils stage=2
-       $(MAKE) -C compiler boot stage=2
+stage2 : check-all
+       $(MAKE) -C compiler stage=2 boot
        $(MAKE) -C compiler stage=2
-       $(RM) -f libraries/ifBuildable/ifBuildable
-       $(MAKE) -C libraries stage=2 ifBuildable/ifBuildable
-       $(RM) -f libraries/installPackage/installPackage
-       $(MAKE) -C libraries stage=2 installPackage/installPackage
-
+ifeq "$(HADDOCK_DOCS)" "YES"
+       $(MAKE) -C compiler stage=2 doc
+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
@@ -161,13 +173,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
@@ -289,91 +301,108 @@ binary-dist::
 
 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
+.PHONY: binary-dist
 
-ifeq "$(darwin_TARGET_OS)" "1"
-BIN_DIST_TOP+=mk/fix_install_names.sh
-endif
+BIN_DIST_VARFILE=$(BIN_DIST_PREP)/Makefile-vars.in
 
-.PHONY: binary-dist-pre% binary-dist
-
-binary-dist:: binary-dist-pre
-
-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
+WHERE_AM_I = $(BIN_DIST_NAME)
 
 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
-
-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 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
+       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 "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)
+       tar cf $(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
 
-.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 >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
+# XXX Presumably we still need to do this for Windows?
+## 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 >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
 
 PUBLISH_FILES = $(BIN_DIST_TARBALL)
 
@@ -474,7 +503,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
@@ -538,7 +567,6 @@ 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 \
@@ -564,10 +592,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
@@ -576,6 +604,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