X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=4d5b40e2b9e3520f443a86df961b5388dc8ffc8f;hb=7025dc693281254624b9cbbf84fd44b73c58eff5;hp=870e0c4dc6f134d9a1a8b282141aa917ea6f50a3;hpb=e0fcf61dca4dfac99cb5417e1bc4cbee18822cf2;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 870e0c4..4d5b40e 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@ endif
 endif
 
 stage1 : $(GCC_LIB_DEP) check-packages
-	$(MAKE) -C utils mostlyclean
+	$(MAKE) -C libraries 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 \
@@ -117,7 +117,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 +127,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
@@ -474,7 +467,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 +557,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