X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=cc32c251d34377aebf1d9e2d115bac4a8fb65c2b;hb=a08aa16ae39b5fc2f4541e9fd33009a5288ba0ae;hp=0f78b67daaaf4667cea2e54cfd19e03e3bdd1510;hpb=7c042349815db6d349586fda9fdcb99460a01e35;p=ghc-hetmet.git

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 0f78b67..cc32c25 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -26,9 +26,36 @@ FPTOOLS_TOP := $(TOP)
 default: all
 
 
+# -----------------------------------------------------------------------------
+# 	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 )
+
+# -----------------------------------------------------------------------------
+# Misc bits
+
+# If $(way) is set then we define $(way_) and $(_way) from it in the
+# obvious fashion.  This must be done before suffix.mk is included,
+# because the pattern rules in that file depend on these variables.
+
+ifneq "$(way)" ""
+  way_ := $(way)_
+  _way := _$(way)
+endif
 
-# 		Now follow the pieces of boilerplate
-#		The "-" signs tell make not to complain if they don't exist
+# -----------------------------------------------------------------------------
+# 	Now follow the pieces of boilerplate
+#	The "-" signs tell make not to complain if they don't exist
 
 include $(TOP)/mk/config.mk
 # All configuration information
@@ -46,8 +73,9 @@ include $(TOP)/mk/opts.mk
 # Variables that control the option flags for all the
 # language processors
 
-include $(TOP)/mk/suffix.mk
-# Suffix rules for Haskell, C and literate 
+ifeq "$(BootingFromHc)" "YES"
+include $(TOP)/mk/bootstrap.mk
+endif
 
 -include $(TOP)/mk/build.mk
 # (Optional) build-specific configuration
@@ -57,4 +85,3 @@ ifndef FAST
 -include .depend
 endif
 # The dependencies file from the current directory
-