FIX profiling after my storage manager changes
[ghc.git] / Makefile
index 5bce2e6..492cc77 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -59,17 +59,17 @@ include $(TOP)/mk/boilerplate.mk
 
 # We can't 'make boot' in libraries until stage1 is built
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_NOLIB = includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = gmp includes rts compat compiler docs utils driver
 else
-SUBDIRS_NOLIB = includes compat utils driver docs compiler rts
+SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts
 endif
 
-SUBDIRS = $(SUBDIRS_NOLIB) libraries
+SUBDIRS = gmp includes compat utils driver docs rts libraries compiler
 
-# Sanity check that all the core libraries are in the tree, to catch
+# Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
 check-packages :
-       @for d in `cat libraries/core-packages`; do \
+       @for d in `cat libraries/boot-packages`; do \
          if test ! -d libraries/$$d; then \
             echo "Looks like you're missing libraries/$$d,"; \
             echo "maybe you haven't done './darcs-all get'?"; \
@@ -82,10 +82,16 @@ check-packages :
            exit 1; \
        fi
 
-stage1 : check-packages
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(WhatGccIsCalled)" ""
+GCC_LIB_DEP = stamp.inplace-gcc-lib
+endif
+endif
+
+stage1 : $(GCC_LIB_DEP) 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 \
+       for i in $(SUBDIRS_BUILD); do \
          echo "------------------------------------------------------------------------"; \
          echo "== $(MAKE) boot $(MFLAGS);"; \
          echo " in $(shell pwd)/$$i"; \
@@ -93,7 +99,7 @@ stage1 : check-packages
          $(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 \
+       for i in $(SUBDIRS_BUILD); do \
          echo "------------------------------------------------------------------------"; \
          echo "== $(MAKE) all $(MFLAGS);"; \
          echo " in $(shell pwd)/$$i"; \
@@ -120,6 +126,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 $(LD) compiler/gcc-lib
+       touch $@
+
+clean ::
+       $(RM) -r compiler/gcc-lib
+       $(RM) -f inplace-gcc-lib
+endif
+endif
+
 all :: bootstrap
 
 # -----------------------------------------------------------------------------
@@ -176,6 +204,11 @@ install ::
 endif
 endif
 
+# Install gcc-extra-opts
+install ::
+       $(INSTALL_DIR) $(DESTDIR)$(libdir)
+       $(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(DESTDIR)$(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); do \
@@ -210,20 +243,25 @@ install-docs ::
 #      binary-dist is a GHC addition for binary distributions
 # 
 
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs-ghc
-else
-BinDistShScripts =
-endif
+binary-dist::
+       -rm -rf $(BIN_DIST_DIR)
+       -$(RM) $(BIN_DIST_DIR).tar.gz
 
-BinDistPrlScripts = ghcprof
-BinDistLibPrlScripts = ghc-asm ghc-split
-BinDistBins = hp2ps runghc
-BinDistLinks = ghc ghci ghc-pkg
-BinDistLibSplicedFiles = package.conf
-BinDistDirs = includes compiler docs driver rts utils
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
-BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
+binary-dist::
+       $(MAKE) prefix=$(BIN_DIST_DIR) install
+
+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_TOP= distrib/Makefile \
               distrib/configure-bin.ac \
@@ -231,8 +269,8 @@ BIN_DIST_TOP= distrib/Makefile \
               distrib/README \
               ANNOUNCE \
               LICENSE \
-              utils/mkdirhier/mkdirhier \
               install-sh \
+             extra-gcc-opts.in \
               config.guess \
               config.sub   \
               aclocal.m4
@@ -243,29 +281,29 @@ endif
 
 .PHONY: binary-dist-pre% binary-dist binary-pack
 
-BINARY_DIST_PRE_RULES=$(foreach d,$(BinDistDirs),binary-dist-pre-$d)
-
-binary-dist:: binary-dist-pre $(BINARY_DIST_PRE_RULES)
+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 mk/build.mk"
-       @false
-endif
-       -rm -rf $(BIN_DIST_DIR)
-       -$(RM) $(BIN_DIST_DIR).tar.gz
-       $(MKDIRHIER) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)
+       $(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/
        $(MKDIRHIER) $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM)
        $(MKDIRHIER) $(BIN_DIST_DIR)/share
 
-$(BINARY_DIST_PRE_RULES): binary-dist-pre-%:
-       $(MAKE) -C $* $(MFLAGS) $(INSTALL_STAGE) install \
-               prefix=$(BIN_DIST_DIR) \
-               exec_prefix=$(BIN_DIST_DIR) \
-               bindir=$(BIN_DIST_DIR)/bin/$(TARGETPLATFORM) \
-               libdir=$(BIN_DIST_DIR)/lib/$(TARGETPLATFORM) \
-               libexecdir=$(BIN_DIST_DIR)/lib/$(TARGETPLATFORM) \
-               datadir=$(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
+       $(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
 
 VARFILE=$(BIN_DIST_DIR)/Makefile-vars.in
 
@@ -280,23 +318,16 @@ binary-dist::
        echo                                                         >  $(VARFILE)
        echo "package = ghc"                                         >> $(VARFILE)
        echo "version = $(ProjectVersion)"                           >> $(VARFILE)
-       echo "PACKAGE_SH_SCRIPTS = $(BinDistShScripts)"              >> $(VARFILE)
-       echo "PACKAGE_PRL_SCRIPTS = $(BinDistPrlScripts)"            >> $(VARFILE)
-       echo "PACKAGE_LIB_PRL_SCRIPTS = $(BinDistLibPrlScripts)"     >> $(VARFILE)
-       echo "PACKAGE_LIB_SPLICED_FILES = $(BinDistLibSplicedFiles)" >> $(VARFILE)
-       echo "PACKAGE_BINS = $(BinDistBins)"                         >> $(VARFILE)
-       echo "PACKAGE_OPT_BINS = $(BinDistOptBins)"                  >> $(VARFILE)
-       echo "PACKAGE_LINKS = $(BinDistLinks)"                       >> $(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)
        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); autoconf )
-
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-binary-dist::
-       $(MKDIRHIER) $(BIN_DIST_DIR)/icons
-       cp distrib/hsicon.ico $(BIN_DIST_DIR)/icons
-endif
+       ( cd $(BIN_DIST_DIR); autoreconf )
 
 #
 # binary dist'ing the documentation.  
@@ -351,62 +382,27 @@ $(BINARY_DIST_DOC_RULES): binary-dist-doc-%:
                datadir=$(BIN_DIST_DIR)/share
 endif
 
-# Rename scripts to $i.prl and $i.sh where necessary.
-# ToDo: do this in a cleaner way...
-
-ifneq "$(BinDistPrlScripts)" ""
-binary-dist::
-       @for i in $(BinDistPrlScripts); do \
-            echo "Renaming $$i to $$i.prl"; \
-           $(MV) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i.prl; \
-       done
-endif
-
-ifneq "$(BinDistLibPrlScripts)" ""
-binary-dist::
-       @for i in $(BinDistLibPrlScripts); do \
-            echo "Renaming $$i to $$i.prl"; \
-           $(MV) $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM)/$$i  $(BIN_DIST_DIR)/lib/$(TARGETPLATFORM)/$$i.prl; \
-       done
-endif
-
-ifneq "$(BinDistShScripts)" ""
-binary-dist::
-       @for i in $(BinDistShScripts); do \
-           if test -x $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i ; then \
-               echo "Renaming $$i to $$i.sh"; \
-               $(MV) $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i  $(BIN_DIST_DIR)/bin/$(TARGETPLATFORM)/$$i.sh; \
-           fi \
-       done
-endif
-
 .PHONY: binary-dist-doc-%
 
 binary-dist::
        $(MAKE) -C libraries binary-dist
 
-# Jiggle the files around to make a valid Windows distribution if necessary
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-binary-dist :: fiddle-binary-dist
 endif
 
-.PHONY: fiddle-binary-dist
-fiddle-binary-dist:
-       cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
 # Tar up the distribution and build a manifest
 binary-dist :: tar-binary-dist
 
 .PHONY: tar-binary-dist
 tar-binary-dist:
-       ( cd $(BIN_DIST_TOPDIR); tar cf - $(BIN_DIST_NAME) | bzip2 >$(BIN_DIST_TARBALL) )
-       ( cd $(BIN_DIST_TOPDIR); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >bin-manifest-$(ProjectVersion) )
+       ( 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) )
 
 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)
 
@@ -419,7 +415,7 @@ endif
 
 # Upload the distribution and documentation
 ifneq "$(PublishLocation)" ""
-binary-dist :: publish-binary-dist
+publish :: publish-binary-dist
 endif
 
 .PHONY: publish-binary-dist
@@ -431,17 +427,23 @@ publish-binary-dist ::
            done \
        done
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-# On Windows, we cannot use absoluate pathnames to rsync, because they look
-# like remote pathnames ("c:/foo/bar").  Also, the docs reside in doc/
-# rather than share/, due to prep-bin-dist-mingw.
-publish-binary-dist ::
-       $(PublishCp) -r $(FPTOOLS_TOP)/$(BIN_DIST_NAME)/doc/html/* $(PublishLocation)/docs
+# You need to first make binddisttest, and then run
+#     make publish 'prefix=$(BIN_DIST_INST_DIR)'
+# for this to find 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
+# the machine c.
+
+ifeq "$(Windows)" "YES"
+PUBLISH_DOCDIR = $(shell cygpath --unix $(docdir))
 else
-publish-binary-dist ::
-       $(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs
+PUBLISH_DOCDIR = $(docdir)
 endif
 
+publish-binary-dist ::
+       $(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!"
 
@@ -467,11 +469,11 @@ 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))
+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 \
-       ghc.spec.in VERSION
+       ghc.spec.in extra-gcc-opts.in VERSION boot
 
 # -----------------------------------------------------------------------------
 # Source distributions
@@ -504,6 +506,7 @@ dist ::
          && for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(FPTOOLS_TOP_ABS)/$$i ); done \
          && 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/ ; fi \
          && $(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 \
        )
@@ -560,7 +563,7 @@ 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
+       ghc.spec 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 
@@ -571,6 +574,10 @@ MAINTAINER_CLEAN_FILES += VERSION
 extraclean::
        $(RM) -rf autom4te.cache
 
+clean distclean ::
+       $(MAKE) -C bindisttest $@
+       if test -d testsuite; then $(MAKE) -C testsuite $@; fi
+
 # -----------------------------------------------------------------------------
 
 # Turn off target.mk's rules for 'all', 'boot' and 'install'.