X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=0e7e752020d3fa8f3bb823745f7bceca470b82c7;hp=cc32c251d34377aebf1d9e2d115bac4a8fb65c2b;hb=74e1368d4688ee16f6decdf2cd3ebe27506b26ba;hpb=4bb9980e0c3c18e93262abc37f3efe36a9f11b07

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index cc32c25..0e7e752 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,7 @@
 # Setting .SUFFIXES to empty disables them all.
 MAKEFLAGS += --no-builtin-rules
 
-# FPTOOLS_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.
-#
+# $(FPTOOLS_TOP) is the old name for $(TOP), kept for backwards compat
 FPTOOLS_TOP := $(TOP)
 
 
@@ -25,21 +22,14 @@ FPTOOLS_TOP := $(TOP)
 #		THIS RULE MUST REMAIN FIRST!
 default: all
 
+#------------------------------------------------------------
+# 			Makefile debugging
+# to see the effective value used for a Makefile variable, do
+#  make show VALUE=MY_VALUE
+#
 
-# -----------------------------------------------------------------------------
-# 	make sure the autoconf stuff is up to date...
-
-$(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/configure 
-	@if test ! -f $(FPTOOLS_TOP)/config.status; then \
-		echo "You haven't run $(FPTOOLS_TOP)/configure yet."; \
-		exit 1; \
-	fi
-	@echo "Running $(FPTOOLS_TOP)/config.status to update configuration info..."
-	@( cd $(FPTOOLS_TOP) && ./config.status )
-
-$(TOP)/configure : $(TOP)/configure.in $(TOP)/aclocal.m4
-	@echo "Regenerating $(FPTOOLS_TOP)/configure..."
-	@( cd $(FPTOOLS_TOP) && $(MAKE) -f Makefile.config ./configure )
+show:
+	@echo '$(VALUE)="$($(VALUE))"'
 
 # -----------------------------------------------------------------------------
 # Misc bits
@@ -53,6 +43,12 @@ ifneq "$(way)" ""
   _way := _$(way)
 endif
 
+
+# When using $(patsubst ...) and friends, you can't use a literal comma
+# freely - so we use ${comma} instead.  (See PACKAGE_CPP_OPTS in package.mk
+# for an example usage.)
+comma=,
+
 # -----------------------------------------------------------------------------
 # 	Now follow the pieces of boilerplate
 #	The "-" signs tell make not to complain if they don't exist
@@ -77,9 +73,8 @@ ifeq "$(BootingFromHc)" "YES"
 include $(TOP)/mk/bootstrap.mk
 endif
 
--include $(TOP)/mk/build.mk
 # (Optional) build-specific configuration
-#
+include $(TOP)/mk/custom-settings.mk
 
 ifndef FAST
 -include .depend