X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=7adec86ad1fdb9231a5e4825f2e061db47035841;hb=b9d13108742ba43244490e0a90b6c80127561139;hp=b48cdca43b9ec117e6741d789bd4e0bc2d353162;hpb=6d0dd9aa562a9f96bf875b7260675609e1171b66;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index b48cdca..7adec86 100644
--- a/Makefile
+++ b/Makefile
@@ -131,8 +131,6 @@ stage1 : $(GCC_LIB_DEP) check-all
 	  $(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 ghc stage=1 boot
-	$(MAKE) -C ghc stage=1
 	$(MAKE) -C rts boot
 	$(MAKE) -C rts
 	$(MAKE) -C libraries all
@@ -151,14 +149,10 @@ stage2 : check-all
 ifeq "$(HADDOCK_DOCS)" "YES"
 	$(MAKE) -C compiler stage=2 doc
 endif
-	$(MAKE) -C ghc      stage=2 boot
-	$(MAKE) -C ghc      stage=2
 
 stage3 : check-all
 	$(MAKE) -C compiler stage=3 boot
 	$(MAKE) -C compiler stage=3
-	$(MAKE) -C ghc      stage=3 boot
-	$(MAKE) -C ghc      stage=3
 
 bootstrap  : bootstrap2
 
@@ -601,7 +595,7 @@ DIST_CLEAN_FILES += config.cache config.status mk/config.h mk/stamp-h \
 	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 
+LATE_DIST_CLEAN_FILES += mk/config.mk mk/are-validating.mk
 
 # VERSION is shipped in a source dist
 MAINTAINER_CLEAN_FILES += VERSION
@@ -610,6 +604,9 @@ extraclean::
 	$(RM) -rf autom4te.cache
 
 clean distclean ::
+	$(RM) -rf inplace-datadir
+
+clean distclean ::
 	$(MAKE) -C bindisttest $@
 	if test -d testsuite; then $(MAKE) -C testsuite $@; fi