White space only

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 73443f6..f65f2bd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,12 +67,12 @@ 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 rts compat compiler docs utils driver
 else
-SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts libraries/Cabal/doc
+SUBDIRS_BUILD = includes compat utils driver docs compiler rts libraries/Cabal/doc
 endif
 
-SUBDIRS = gmp includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
+SUBDIRS = gmp libffi includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
 
 # Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
@@ -98,7 +98,9 @@ endif
 endif
 
 stage1 : $(GCC_LIB_DEP) check-packages
-       $(MAKE) -C utils mostlyclean
+       $(MAKE) -C libraries boot
+       $(MAKE) -C gmp       all
+       $(MAKE) -C libffi    all
        $(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_BUILD); do \
@@ -117,7 +119,6 @@ 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 libraries all
 
 # When making distributions (i.e., whether with binary-dist or using the 
@@ -128,14 +129,8 @@ stage1 : $(GCC_LIB_DEP) check-packages
 # 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
        $(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
 
 
 stage3 : check-packages
@@ -353,7 +348,7 @@ binary-dist::
        echo "HaveLibGmp = $(HaveLibGmp)"                            >> $(VARFILE)
        echo "GhcLibsWithUnix = $(GhcLibsWithUnix)"                  >> $(VARFILE)
        echo "GhcWithInterpreter = $(GhcWithInterpreter)"            >> $(VARFILE)
-       echo "GhcHasReadline = $(GhcHasReadline)"                    >> $(VARFILE)
+       echo "GhcHasEditline = $(GhcHasEditline)"                    >> $(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
@@ -474,7 +469,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
@@ -564,7 +559,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 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