X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=69c419c47d8ad79a12d0892049e9f5b2b7fa50fd;hp=d4303b639d83aea59393c572e77ada197e2f1e27;hb=25cead299c5857b9142a82c917080a654be44b83;hpb=637e621af0214877c98cb3ca5ae4dca5f737c316

diff --git a/Makefile b/Makefile
index d4303b6..69c419c 100644
--- a/Makefile
+++ b/Makefile
@@ -32,16 +32,24 @@ else
 default : all
 	@:
 
-include mk/config.mk
+# For help, type 'make help'
+.PHONY: help
+help :
+	@cat MAKEHELP
 
+ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
+-include mk/config.mk
+else
+include mk/config.mk
 ifeq "$(ProjectVersion)" ""
 $(error Please run ./configure first)
 endif
+endif
 
 include mk/custom-settings.mk
 
 # 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))
 
 # NB. not the same as saying '%: ...', which doesn't do the right thing:
 # it does nothing if we specify a target that already exists.
@@ -49,28 +57,39 @@ REALGOALS=$(filter-out framework-pkg clean clean_% distclean maintainer-clean sh
 $(REALGOALS) all:
 	@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:
+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 $@
+	$(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
 
-show:
+bootstrapping-files show:
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
 ifeq "$(darwin_TARGET_OS)" "1"
@@ -83,4 +102,3 @@ endif
 .NOTPARALLEL:
 
 endif
-