[project @ 2004-09-10 09:46:21 by simonmar]

[ghc-hetmet.git] / mk / boilerplate.mk

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 3790d7e..bb6483a 100644 (file)
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -29,17 +29,39 @@ 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 
+$(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 "Running $(FPTOOLS_TOP)/config.status to update configuration info..."
+       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 )
 
-$(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
+
+
+# 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
@@ -73,4 +95,3 @@ ifndef FAST
 -include .depend
 endif
 # The dependencies file from the current directory
-