Moving check for PUGH and MPI to a dependency, so the check is done after

a new make.thornlist is created.

Tom


git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGHIO/IOPanda/trunk@34 38c3d835-c875-442e-b0fe-21c19ce1d001

2 files changed, 23 insertions, 13 deletions

diff --git a/src/make.configuration.defn b/src/make.configuration.defn
deleted file mode 100644
index 5457011..0000000
--- a/src/make.configuration.defn
+++ /dev/null
@@ -1,13 +0,0 @@
-# make.configuration.defn for IOPanda
-# $Header$
-
-# make sure that IOPanda was configured with PUGH and MPI
-
-ifeq ($(findstring CactusPUGH/PUGH,$(THORNS)),)
-  $(error "IOPanda requires PUGH. Please add CactusPUGH/PUGH or remove IOPanda from Thornlist !")
-endif
-
-MPI_CONFIGURED := $(shell grep -l CCTK_MPI $(CONFIG)/cctk_Extradefs.h)
-ifneq ("$(MPI_CONFIGURED)", "$(CONFIG)/cctk_Extradefs.h")
-  $(error "IOPanda requires MPI. Please configure with MPI or remove IOPanda from Thornlist !")
-endif
diff --git a/src/make.configuration.deps b/src/make.configuration.deps
new file mode 100644
index 0000000..a75b2a3
--- /dev/null
+++ b/src/make.configuration.deps
@@ -0,0 +1,23 @@
+# /*@@
+#   @file      make.configuration.deps
+#   @date      Fri May 17 02:53:09 2002
+#   @author    Tom Goodale
+#   @desc 
+#   Extra checks for IOPanda
+#   @enddesc 
+#   @version $Header$
+# @@*/
+
+update: panda_check
+
+.PHONY: panda_check
+
+panda_check:
+	if test -z "$(findstring CactusPUGH/PUGH,$(THORNS))" ; then                                    \
+	  echo "IOPanda requires PUGH. Please add CactusPUGH/PUGH or remove IOPanda from Thornlist !"; \
+	  exit 2;                                                                                      \
+        fi
+	if test -z "`grep CCTK_MPI $(CONFIG)/cctk_Extradefs.h`" ; then                                 \
+	  echo "IOPanda requires MPI. Please configure with MPI or remove IOPanda from Thornlist !";   \
+	  exit 2;                                                                                      \
+	fi