Make the alternative layout rule cope with file pragmas

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 69c419c..de5ee8a 100644 (file)
--- 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,12 +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,$(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.
+%.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:
+$(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"
@@ -72,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"
-       $(MAKE) -r --no-print-directory -f ghc.mk windows-binary-dist
+       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-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:
@@ -97,6 +108,12 @@ 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: