X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=0d563df8e1e7cf1dcc203346e2b15491f1980ac9;hb=0bde11509ca13d4d0914496ee652d7c2b43a0420;hp=a80dceefc99c5a31252d991e227085c5146b8f99;hpb=cbc627e356049cb73206c7afeca57c410a69bfe4;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index a80dcee..0d563df 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,17 +48,42 @@ endif
 
 include mk/custom-settings.mk
 
-PACKAGE_MK=libraries/base/ghc.mk
-$(PACKAGE_MK):
-	sh boot-pkgs
-
 # 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.
+#
+define check-configure-file
+# $1 = file
+if ! test -f $1.old; then \
+  echo "backing up $1"; \
+  cp $1 $1.old; \
+  touch -r $1 $1.old; \
+else \
+  if test $1 -nt $1.old; then \
+    if cmp $1 $1.old; then \
+       echo "$1 has been touched, but has not changed"; \
+       touch -r $1.old $1; \
+    else \
+       echo "$1 has changed"; \
+       cp $1 $1.old; \
+       touch -r $1 $1.old; \
+    fi \
+  fi \
+fi
+endef
 
 # 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:
+	@$(call check-configure-file,mk/config.mk)
+	@$(call check-configure-file,mk/project.mk)
+	@$(call check-configure-file,compiler/ghc.cabal)
+
 	@echo "===--- updating makefiles phase 0"
 	$(MAKE) -r --no-print-directory -f ghc.mk phase=0 just-makefiles
 ifneq "$(OMIT_PHASE_1)" "YES"
@@ -72,18 +102,23 @@ 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
 	test ! -d testsuite || $(MAKE) -C testsuite $@
 
 $(filter clean_%, $(MAKECMDGOALS)) : clean_% :
-	$(MAKE) -r --no-print-directory -f ghc.mk $@
+	$(MAKE) -r --no-print-directory -f ghc.mk $@ CLEANING=YES
 
-bootstrapping-files show: $(PACKAGE_MK)
+bootstrapping-files show:
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
 ifeq "$(darwin_TARGET_OS)" "1"