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

diff --git a/Makefile b/Makefile
index 28328b3..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
@@ -44,12 +49,21 @@ endif
 include mk/custom-settings.mk
 
 # No need to update makefiles for these targets:
-REALGOALS=$(filter-out bootstrapping-files 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:
+$(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"
@@ -68,9 +82,14 @@ endif
 	$(MAKE) -r --no-print-directory -f ghc.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:
 	$(MAKE) -r --no-print-directory -f ghc.mk $@ CLEANING=YES