X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=94d6df8ad7be18be4098753cae05adceeacdfff4;hb=aa0c0de94e25aa64139688f8e4c4ba51ddca6f54;hp=d0f52b93a67f9f6f7be2efeb0fcb007b82a5d785;hpb=11e3da87d34465406147927fd89fb64b147cfaca;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index d0f52b9..94d6df8 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,11 @@ else
 default : all
 	@:
 
+# For help, type 'make help'
+.PHONY: help
+help :
+	@cat MAKEHELP
+
 ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
 -include mk/config.mk
 else
@@ -43,43 +48,57 @@ endif
 
 include mk/custom-settings.mk
 
-# If the package ghc.mk files are missing, generate them.  This means that
-# repeating 'make maintainer-clean' works.
-PACKAGE_MK=libraries/base/ghc.mk
-$(PACKAGE_MK):
-	sh boot-pkgs
-
 # No need to update makefiles for these targets:
-REALGOALS=$(filter-out framework-pkg clean clean_% distclean maintainer-clean show,$(MAKECMDGOALS))
+REALGOALS=$(filter-out bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show help,$(MAKECMDGOALS))
+
+# configure touches certain files even if they haven't changed.  This
+# can mean a lot of unnecessary recompilation after a re-configure, so
+# here we cache the old versions of these files so we can restore the
+# timestamps.
+%.old:  %
+	@set -x && test -f $@ && cmp -s $< $@ || cp -p $< $@
+	touch -r $@ $<
+
 
 # NB. not the same as saying '%: ...', which doesn't do the right thing:
 # it does nothing if we specify a target that already exists.
 .PHONY: $(REALGOALS)
-$(REALGOALS) all: $(PACKAGE_MK)
+$(REALGOALS) all: mk/config.mk.old mk/project.mk.old compiler/ghc.cabal.old
 	@echo "===--- updating makefiles phase 0"
 	$(MAKE) -r --no-print-directory -f ghc.mk phase=0 just-makefiles
+ifneq "$(OMIT_PHASE_1)" "YES"
 	@echo "===--- updating makefiles phase 1"
 	$(MAKE) -r --no-print-directory -f ghc.mk phase=1 just-makefiles
+endif
+ifneq "$(OMIT_PHASE_2)" "YES"
 	@echo "===--- updating makefiles phase 2"
 	$(MAKE) -r --no-print-directory -f ghc.mk phase=2 just-makefiles
+endif
+ifneq "$(OMIT_PHASE_3)" "YES"
 	@echo "===--- updating makefiles phase 3"
 	$(MAKE) -r --no-print-directory -f ghc.mk phase=3 just-makefiles
+endif
 	@echo "===--- finished updating makefiles"
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
-binary-dist: $(PACKAGE_MK)
+binary-dist:
+ifeq "$(mingw32_TARGET_OS)" "1"
+	$(MAKE) -r --no-print-directory -f ghc.mk windows-binary-dist
+	$(MAKE) -r --no-print-directory -f ghc.mk windows-installer
+else
 	rm -f bindist-list
 	$(MAKE) -r --no-print-directory -f ghc.mk bindist BINDIST=YES
 	$(MAKE) -r --no-print-directory -f ghc.mk binary-dist
+endif
 
-clean distclean maintainer-clean: $(PACKAGE_MK)
-	$(MAKE) -r --no-print-directory -f ghc.mk $@
+clean distclean maintainer-clean:
+	$(MAKE) -r --no-print-directory -f ghc.mk $@ CLEANING=YES
 	test ! -d testsuite || $(MAKE) -C testsuite $@
 
-$(filter clean_%, $(MAKECMDGOALS)) : clean_% : $(PACKAGE_MK)
-	$(MAKE) -r --no-print-directory -f ghc.mk $@
+$(filter clean_%, $(MAKECMDGOALS)) : clean_% :
+	$(MAKE) -r --no-print-directory -f ghc.mk $@ CLEANING=YES
 
-show: $(PACKAGE_MK)
+bootstrapping-files show:
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
 ifeq "$(darwin_TARGET_OS)" "1"