From 29737dfc780bff5db9416037bce07664ed1ef767 Mon Sep 17 00:00:00 2001 From: schnetter Date: Sat, 10 Apr 2004 19:57:02 +0000 Subject: Introduce the mechanism that forces users to re-configure their configurations. (I updated detecting external libraries (MPI, PETSc, etc.) to use a scheme more sane, and realise only after the fact that people will have to reconfigure for that.) git-svn-id: http://svn.cactuscode.org/flesh/trunk@3657 17b73243-c579-4c4c-a9d2-2d5706c11dac --- Makefile | 11 ++++++++++- lib/make/force-reconfigure | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 lib/make/force-reconfigure diff --git a/Makefile b/Makefile index 24136c2c..7222ac84 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ # # # @enddesc -# @version $Id: Makefile,v 1.149 2004-03-30 17:49:46 goodale Exp $ +# @version $Id: Makefile,v 1.150 2004-04-10 19:57:02 schnetter Exp $ # @@*/ ################################################################################## @@ -232,6 +232,15 @@ endif .PHONY: $(CONFIGURATIONS) $(CONFIGURATIONS): + if test $(CONFIGS_DIR)/$@/config-info -ot $(CCTK_HOME)/lib/make/force-reconfigure ; then \ + echo $(DIVIDER);\ + echo "Cactus - version: $(CCTK_VERSION)";\ + echo "Error: Configuration $@ is out of date.";\ + echo "Re-run your '$(MAKE) $@-config' command with the appropriate options.";\ + echo "(It is likely that recent changes to the flesh that require this.)";\ + echo $(DIVIDER);\ + exit 1;\ + fi if test "x${MAKELEVEL}" = "x0" ; then \ echo $(DIVIDER);\ echo "Cactus - version: $(CCTK_VERSION)"; \ diff --git a/lib/make/force-reconfigure b/lib/make/force-reconfigure new file mode 100644 index 00000000..1f7bd068 --- /dev/null +++ b/lib/make/force-reconfigure @@ -0,0 +1,12 @@ +# /*@@ +# @file force-reconfigure +# @date Wed Mar 31 2004 +# @author Erik Schnetter +# @desc +# Timestamp file for forcing reconfiguring configurations +# @enddesc +# @version $Id: force-reconfigure,v 1.1 2004-04-10 19:57:02 schnetter Exp $ +# @@*/ + +31 Mar 2004: created +10 Apr 2004: thorns now check for FFTW, MPI, and PETSc in a more reliable way -- cgit v1.2.3