X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=9e3319e6db698bfdf5dbe6c13966a130f5b01aac;hb=366614a9a33b30c2273d2c63b3435259f729314b;hp=c4ff13cfca4ac8a80de6f2bf07f4bfe1c547a74e;hpb=79b4f894215ae098c26cfe8fb7bc7f89008e8420;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index c4ff13c..9e3319e 100644
--- 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 libffi includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = includes rts compiler docs utils driver
 else
-SUBDIRS_BUILD = gmp libffi includes compat utils driver docs compiler rts libraries/Cabal/doc
+SUBDIRS_BUILD = includes utils driver docs compiler rts libraries/Cabal/doc
 endif
 
-SUBDIRS = gmp libffi includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
+SUBDIRS = gmp libffi includes 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.
@@ -99,6 +99,8 @@ endif
 
 stage1 : $(GCC_LIB_DEP) check-packages
 	$(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 \
@@ -310,7 +312,6 @@ binary-dist-pre::
 	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/
@@ -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
@@ -531,7 +532,6 @@ hc-file-bundle :
 	$(LN_S) . ghc-$(ProjectVersion)
 	$(FIND) ghc-$(ProjectVersion)/compiler \
 	     ghc-$(ProjectVersion)/utils \
-	     ghc-$(ProjectVersion)/compat \
 	     ghc-$(ProjectVersion)/libraries -follow \
 	  \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
 	for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/utils ghc-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \
@@ -557,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