X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=9fc22c9421fa83a6df9570e40e9e04066cae98a3;hb=acc2bdc717b4b24ec5b26a85cf3256a36a42d08b;hp=23c0a74f90dc4199e1135f0f5cd80dad0c9051dd;hpb=f2e53b6f1045941243d2d5e76e9b01b6e769ddd9;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 23c0a74..9fc22c9 100644
--- a/Makefile
+++ b/Makefile
@@ -67,9 +67,9 @@ include $(TOP)/mk/boilerplate.mk
 
 # We can't 'make boot' in libraries until stage1 is built
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_BUILD = gmp libffi includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = libffi includes rts compat compiler docs utils driver
 else
-SUBDIRS_BUILD = gmp libffi includes compat utils driver docs compiler rts libraries/Cabal/doc
+SUBDIRS_BUILD = libffi includes compat utils driver docs compiler rts libraries/Cabal/doc
 endif
 
 SUBDIRS = gmp libffi includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
@@ -98,6 +98,8 @@ endif
 endif
 
 stage1 : $(GCC_LIB_DEP) check-packages
+	$(MAKE) -C libraries boot
+	$(MAKE) -C gmp       boot
 	$(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 \
@@ -116,7 +118,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 
@@ -467,7 +468,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
@@ -557,7 +558,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