diff options
| author | eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-08-25 18:52:53 +0000 |
|---|---|---|
| committer | eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2011-08-25 18:52:53 +0000 |
| commit | 54aea95a18c6fc26c5319f071fb8b21307478be2 (patch) | |
| tree | eb2ef8b2388fb5476eb75f0c61bab20dd0f83608 /lib/make/make.configuration | |
| parent | 830484bf7e70a76e2f1b6c2495a937f558dd3b5a (diff) | |
Allow a configuration.ccl file for the flesh
The mechanism in Cactus that handles configuration.ccl files currently
cannot handle a configuration.ccl for the flesh. This patch corrects
this.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4720 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.configuration')
| -rw-r--r-- | lib/make/make.configuration | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/make/make.configuration b/lib/make/make.configuration index 2707a96b..f145eb89 100644 --- a/lib/make/make.configuration +++ b/lib/make/make.configuration @@ -212,7 +212,7 @@ include $(CONFIG)/make.config.deps rebuild: $(CONFIG)/make.thornlist -$(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) $(CCTK_HOME)/lib/make/force-rebuild +$(CONFIG)/make.thornlist: $(TOP)/ThornList $(foreach lib, $(CCTK_HOME)/src $(THORNS:%=$(PACKAGE_DIR)/%), $(lib)/param.ccl $(lib)/interface.ccl $(lib)/schedule.ccl) $(CCTK_HOME)/src/configuration.ccl $(CONFIG_THORNS:%=$(PACKAGE_DIR)/%/configuration.ccl) $(CCTK_HOME)/lib/make/force-rebuild if [ -r $@ ] ; then echo Reconfiguring thorns ; rm $@ ;\ else echo Processing CCL files ; fi +$(PERL) -s $(CST) -config_dir=$(CONFIG) -cctk_home=$(CCTK_HOME) -top=$(TOP) $< @@ -244,7 +244,7 @@ ifneq ($(strip $(THORNS)),) endif # Catch the special case of a thorn being removed from the disk entirely. -$(foreach lib, $(CCTK_HOME)/src $(THORNS:%=$(PACKAGE_DIR)/%), $(lib)/param.ccl $(lib)/interface.ccl $(lib)/schedule.ccl) $(CONFIG_THORNS:%=$(PACKAGE_DIR)/%/configuration.ccl): +$(foreach lib, $(CCTK_HOME)/src $(THORNS:%=$(PACKAGE_DIR)/%), $(lib)/param.ccl $(lib)/interface.ccl $(lib)/schedule.ccl) $(CCTK_HOME)/src/configuration.ccl $(CONFIG_THORNS:%=$(PACKAGE_DIR)/%/configuration.ccl): @echo "Missing file $@" @echo "Possibly from a thorn deleted from an arrangement" @echo "Deleting make.thornlist" |