X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=14194fbd223ff5ed862ebb5a6a7a97cf4be04166;hp=bb6483aa6a1bdcb0ae97081be146df2c4ee3c2b4;hb=0e86b6601ea17d89c7f46b3a902093d4c6020da8;hpb=1f81c9b1f21945b2e6772828576e766e6f1238cf

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index bb6483a..14194fb 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -2,10 +2,10 @@
 #
 #			    mk/boilerplate.mk
 #
-#		The Glorious fptools Boilerplate Makefile
+#		The Glorious GHC Boilerplate Makefile
 #
 # This one file should be included (directly or indirectly) by all Makefiles 
-# in the fptools hierarchy.
+# in the GHC hierarchy.
 #
 #################################################################################
 
@@ -14,10 +14,13 @@
 # Setting .SUFFIXES to empty disables them all.
 MAKEFLAGS += --no-builtin-rules
 
-# FPTOOLS_TOP is the *relative* path to the fptools toplevel directory from the
+# GHC_TOP is the *relative* path to the fptools toplevel directory from the
 # location where a project Makefile was invoked. It is set by looking at the
 # current value of TOP.
 #
+GHC_TOP := $(TOP)
+
+# $(FPTOOLS_TOP) is the old name for $(GHC_TOP), kept for backwards compat
 FPTOOLS_TOP := $(TOP)
 
 
@@ -25,26 +28,6 @@ FPTOOLS_TOP := $(TOP)
 #		THIS RULE MUST REMAIN FIRST!
 default: all
 
-
-# -----------------------------------------------------------------------------
-# 	make sure the autoconf stuff is up to date...
-
-$(TOP)/configure : $(TOP)/configure.ac $(TOP)/aclocal.m4
-	@echo "Running autoreconf in $(FPTOOLS_TOP)  ..."
-	@( cd $(FPTOOLS_TOP) && autoreconf )
-
-$(TOP)/config.status : $(TOP)/configure
-	@if test ! -f $(FPTOOLS_TOP)/config.status; then \
-		echo "You haven't run $(FPTOOLS_TOP)/configure yet."; \
-		exit 1; \
-	fi
-	echo "configure changed, reconfiguring with same settings..."; \
-	( cd $(FPTOOLS_TOP) && ./config.status --recheck ); \
-
-$(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/configure $(TOP)/config.status
-	@echo "Running $(FPTOOLS_TOP)/config.status to update configuration info...";
-	@( cd $(FPTOOLS_TOP) && ./config.status )
-
 # -----------------------------------------------------------------------------
 # Misc bits
 
@@ -87,9 +70,14 @@ ifeq "$(BootingFromHc)" "YES"
 include $(TOP)/mk/bootstrap.mk
 endif
 
+ifeq "$(Validating)" "YES"
+include $(TOP)/mk/validate-settings.mk
+-include $(TOP)/mk/validate.mk
+else
 -include $(TOP)/mk/build.mk
 # (Optional) build-specific configuration
 #
+endif
 
 ifndef FAST
 -include .depend