Checks for configuration.ccl files.

Tries to give a sensible error action when a thorn which has
previously been compiled in has been removed from its
arrangement on disk.  This fixes PR 349.

Tom


git-svn-id: http://svn.cactuscode.org/flesh/trunk@1805 17b73243-c579-4c4c-a9d2-2d5706c11dac

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/make/make.configuration b/lib/make/make.configuration
index 038a462d..189dcd89 100644
--- a/lib/make/make.configuration
+++ b/lib/make/make.configuration
@@ -126,7 +126,7 @@ include $(CONFIG)/make.config.deps
 
 # Rule to build the make.thornlist file from the ThornList file
 
-$(CONFIG)/make.thornlist: $(TOP)/ThornList $(foreach lib, $(CCTK_HOME)/src $(THORNS:%=$(PACKAGE_DIR)/%), $(lib)/param.ccl $(lib)/interface.ccl $(lib)/schedule.ccl)
+$(CONFIG)/make.thornlist: $(TOP)/ThornList $(foreach lib, $(CCTK_HOME)/src $(THORNS:%=$(PACKAGE_DIR)/%), $(lib)/param.ccl $(lib)/interface.ccl $(lib)/schedule.ccl) $(CONFIG_THORNS:%=$(PACKAGE_DIR)/%/configuration.ccl)
 	@echo $(DIVIDER)
 	if [ -r $@ ] ; then echo Reconfiguring thorns ; rm $@ ;\
 	else echo Processing CCL files ; fi
@@ -183,6 +183,14 @@ editthorns:
 	done
 	@echo $(DIVIDER)
 
+$(foreach lib, $(CCTK_HOME)/src $(THORNS:%=$(PACKAGE_DIR)/%), $(lib)/param.ccl $(lib)/interface.ccl $(lib)/schedule.ccl) $(CONFIG_THORNS:%=$(PACKAGE_DIR)/%/configuration.ccl):
+	@echo "Missing file $@"
+	@echo "Possibly from a thorn deleted from an arrangement"
+	@echo "Deleting make.thornlist" 
+	rm  $(CONFIG)/make.thornlist
+	@echo "Please try building again"
+	exit 1
+
 clean:
 	@echo Deleting all object and dependency files in $(TOP)
 	find $(TOP) \( -name '*.[od]' -o -name '*.a' \) -exec rm {} \;