X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=f15677d68bc10d75d321c63e7c1380f17a08f93c;hb=8a3ed3364fbc74b1f1b87b049737da2b251f92df;hp=d0f52b93a67f9f6f7be2efeb0fcb007b82a5d785;hpb=11e3da87d34465406147927fd89fb64b147cfaca;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index d0f52b9..f15677d 100644 --- a/Makefile +++ b/Makefile @@ -43,14 +43,12 @@ 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,$(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. @@ -67,19 +65,19 @@ $(REALGOALS) all: $(PACKAGE_MK) @echo "===--- finished updating makefiles" $(MAKE) -r --no-print-directory -f ghc.mk $@ -binary-dist: $(PACKAGE_MK) +binary-dist: 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 -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) +$(filter clean_%, $(MAKECMDGOALS)) : clean_% : $(MAKE) -r --no-print-directory -f ghc.mk $@ -show: $(PACKAGE_MK) +bootstrapping-files show: $(PACKAGE_MK) $(MAKE) -r --no-print-directory -f ghc.mk $@ ifeq "$(darwin_TARGET_OS)" "1"