X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=f15677d68bc10d75d321c63e7c1380f17a08f93c;hb=8a3ed3364fbc74b1f1b87b049737da2b251f92df;hp=bca8e86432c37987666149a5586415eef0fbeb48;hpb=c59c053f0b8613dd128297ee0b6eef31f001c498;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index bca8e86..f15677d 100644
--- a/Makefile
+++ b/Makefile
@@ -32,13 +32,28 @@ else
 default : all
 	@:
 
+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
+
+PACKAGE_MK=libraries/base/ghc.mk
+$(PACKAGE_MK):
+	sh boot-pkgs
+
 # No need to update makefiles for these targets:
-REALGOALS=$(filter-out clean clean_% distclean maintainer-clean show,$(MAKECMDGOALS))
+REALGOALS=$(filter-out bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show,$(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.
 .PHONY: $(REALGOALS)
-$(REALGOALS) all:
+$(REALGOALS) all: $(PACKAGE_MK)
 	@echo "===--- updating makefiles phase 0"
 	$(MAKE) -r --no-print-directory -f ghc.mk phase=0 just-makefiles
 	@echo "===--- updating makefiles phase 1"
@@ -56,18 +71,22 @@ binary-dist:
 	$(MAKE) -r --no-print-directory -f ghc.mk binary-dist
 
 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 $@
 
-show:
+bootstrapping-files show: $(PACKAGE_MK)
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
+ifeq "$(darwin_TARGET_OS)" "1"
+framework-pkg:
+	$(MAKE) -C distrib/MacOS $@
+endif
+
 # If the user says 'make A B', then we don't want to invoke two
 # instances of the rule above in parallel:
 .NOTPARALLEL:
 
 endif
-