include bindisttest in source distributions (fixes srcdist)

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 2ab4d5e..7a62fa9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,12 +59,12 @@ include $(TOP)/mk/boilerplate.mk
 
 # We can't 'make boot' in libraries until stage1 is built
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_BUILD = includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = gmp includes rts compat compiler docs utils driver
 else
-SUBDIRS_BUILD = includes compat utils driver docs compiler rts
+SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts
 endif
 
-SUBDIRS_INSTALL = includes compat utils driver docs rts libraries compiler
+SUBDIRS = gmp includes compat utils driver docs rts libraries compiler
 
 # Sanity check that all the core libraries are in the tree, to catch
 # failure to run darcs-all.
@@ -120,6 +120,28 @@ bootstrap2 : stage1
 bootstrap3 : bootstrap2
        $(MAKE) stage3
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(WhatGccIsCalled)" ""
+all :: stamp.inplace-gcc-lib
+
+.PHONY: stamp.inplace-gcc-lib
+
+# This is a hack to make Cabal able to find ld when we run tests with
+# the inplace ghc. We should probably install all the gcc stuff in our
+# 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 $(GccDir)ld.exe compiler/gcc-lib
+       touch $@
+
+clean ::
+       $(RM) -r compiler/gcc-lib
+       $(RM) -f inplace-gcc-lib
+endif
+endif
+
 all :: bootstrap
 
 # -----------------------------------------------------------------------------
@@ -137,7 +159,7 @@ endif
 install :: check-packages
        $(INSTALL_DIR) $(bindir)
        @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
-       for i in $(SUBDIRS_INSTALL); do \
+       for i in $(SUBDIRS); do \
          echo "------------------------------------------------------------------------"; \
          echo "== $(MAKE) $@ $(MFLAGS);"; \
          echo " in $(shell pwd)/$$i"; \
@@ -177,9 +199,14 @@ install ::
 endif
 endif
 
+# Install gcc-extra-opts
+install ::
+       @$(INSTALL_DIR) $(libdir)
+       $(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(libdir)
+
 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_INSTALL); do \
+       for i in $(SUBDIRS); do \
          echo "------------------------------------------------------------------------"; \
          echo "== $(MAKE) $@ $(MFLAGS);"; \
          echo " in $(shell pwd)/$$i"; \
@@ -211,6 +238,10 @@ install-docs ::
 #      binary-dist is a GHC addition for binary distributions
 # 
 
+binary-dist::
+       -rm -rf $(BIN_DIST_DIR)
+       -$(RM) $(BIN_DIST_DIR).tar.gz
+
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
 binary-dist::
@@ -219,12 +250,14 @@ binary-dist::
 binary-dist::
        cd $(BIN_DIST_DIR) && ../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_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
-
 BIN_DIST_TOP= distrib/Makefile \
               distrib/configure-bin.ac \
               distrib/INSTALL \
@@ -232,6 +265,7 @@ BIN_DIST_TOP= distrib/Makefile \
               ANNOUNCE \
               LICENSE \
               install-sh \
+             extra-gcc-opts.in \
               config.guess \
               config.sub   \
               aclocal.m4
@@ -245,11 +279,10 @@ endif
 binary-dist:: binary-dist-pre
 
 binary-dist-pre::
-       -rm -rf $(BIN_DIST_DIR)
-       -$(RM) $(BIN_DIST_DIR).tar.gz
        $(MKDIRHIER) $(BIN_DIST_DIR)/mk
        echo 'include $$(TOP)/Makefile-vars' >  $(BIN_DIST_DIR)/mk/boilerplate.mk
-       echo 'include $$(TOP)/mk/install.mk' >  $(BIN_DIST_DIR)/mk/target.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/
@@ -259,6 +292,7 @@ binary-dist-pre::
        $(MKDIRHIER) $(BIN_DIST_DIR)/share
 
 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)
        # XXX $(MAKE) -C docs     binary-dist DOING_BIN_DIST=YES
@@ -282,17 +316,14 @@ binary-dist::
        echo "ProjectVersion = $(ProjectVersion)"                    >> $(VARFILE)
        echo "HaveLibGmp = $(HaveLibGmp)"                            >> $(VARFILE)
        echo "GhcLibsWithUnix = $(GhcLibsWithUnix)"                  >> $(VARFILE)
+       echo "GhcWithInterpreter = $(GhcWithInterpreter)"            >> $(VARFILE)
+       echo "GhcHasReadline = $(GhcHasReadline)"                    >> $(VARFILE)
+       echo "BootingFromHc = $(BootingFromHc)"                      >> $(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 )
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-binary-dist::
-       $(MKDIRHIER) $(BIN_DIST_DIR)/icons
-       cp distrib/hsicon.ico $(BIN_DIST_DIR)/icons
-endif
-
 #
 # binary dist'ing the documentation.  
 # The default documentation to build/install is given below; overrideable
@@ -366,7 +397,7 @@ PUBLISH_FILES = $(BIN_DIST_TARBALL)
 # Upload the distribution and documentation
 ifneq "$(ISCC)" ""
 WINDOWS_INSTALLER_BASE = ghc-$(ProjectVersion)-$(TARGETPLATFORM)
-WINDOWS_INSTALLER = $(WINDOWS_INSTALLER)$(exeext)
+WINDOWS_INSTALLER = $(WINDOWS_INSTALLER_BASE)$(exeext)
 
 PUBLISH_FILES += $(WINDOWS_INSTALLER)
 
@@ -427,7 +458,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS += mk docs distrib $(filter-out docs distrib,$(SUBDIRS_INSTALL))
+SRC_DIST_DIRS += mk docs distrib bindisttest $(filter-out docs distrib,$(SUBDIRS))
 SRC_DIST_FILES += \
        configure.ac config.guess config.sub configure \
        aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
@@ -531,6 +562,9 @@ MAINTAINER_CLEAN_FILES += VERSION
 extraclean::
        $(RM) -rf autom4te.cache
 
+clean distclean ::
+       $(MAKE) -C bindisttest $@
+
 # -----------------------------------------------------------------------------
 
 # Turn off target.mk's rules for 'all', 'boot' and 'install'.