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

diff --git a/Makefile b/Makefile
index 0d563df..93ee7bc 100644
--- a/Makefile
+++ b/Makefile
@@ -19,13 +19,9 @@ default:
 	@echo 'Run "make install" to install'
 	@false
 
-.PHONY: install
-install:
-	$(MAKE) -r --no-print-directory -f ghc.mk install BINDIST=YES NO_INCLUDE_DEPS=YES
-
-.PHONY: show
-show:
-	$(MAKE) -r --no-print-directory -f ghc.mk $@
+.PHONY: install show
+install show:
+	$(MAKE) -r --no-print-directory -f ghc.mk $@ BINDIST=YES NO_INCLUDE_DEPS=YES
 
 else
 
@@ -49,41 +45,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 help,$(MAKECMDGOALS))
+REALGOALS=$(filter-out binary-dist binary-dist-prep bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show help install-docs test fulltest,$(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
+%.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:
-	@$(call check-configure-file,mk/config.mk)
-	@$(call check-configure-file,mk/project.mk)
-	@$(call check-configure-file,compiler/ghc.cabal)
-
+$(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"
@@ -101,14 +77,20 @@ endif
 	@echo "===--- finished updating makefiles"
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
-binary-dist:
+binary-dist: binary-dist-prep
+ifeq "$(mingw32_TARGET_OS)" "1"
+	mv bindistprep/*.exe .
+endif
+	mv bindistprep/*.tar.bz2 .
+
+binary-dist-prep:
 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-binary-dist-prep
 	$(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
+	$(MAKE) -r --no-print-directory -f ghc.mk unix-binary-dist-prep
 endif
 
 clean distclean maintainer-clean:
@@ -126,8 +108,23 @@ framework-pkg:
 	$(MAKE) -C distrib/MacOS $@
 endif
 
+# install-docs is a historical target that isn't supported in GHC 6.12. See #3662.
+install-docs:
+	@echo "The install-docs target is not supported in GHC 6.12.1 and later."
+	@echo "'make install' now installs everything, including documentation."
+	@exit 1
+
 # If the user says 'make A B', then we don't want to invoke two
 # instances of the rule above in parallel:
 .NOTPARALLEL:
 
 endif
+
+.PHONY: test
+test:
+	$(MAKE) -C testsuite/tests/ghc-regress CLEANUP=1 OUTPUT_SUMMARY=../../../testsuite_summary.txt fast
+
+.PHONY: fulltest
+fulltest:
+	$(MAKE) -C testsuite/tests/ghc-regress CLEANUP=1 OUTPUT_SUMMARY=../../../testsuite_summary.txt
+