diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-03-26 00:18:00 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2004-03-26 00:18:00 +0000 |
| commit | 55357998e19e21fd85218f30eb7415ad4135bc15 (patch) | |
| tree | 887840de59f7aea99e18b515b6e0a21a5a02a69d /lib/make/make.thornlib | |
| parent | cf724d39baa6101da7ef202958a72d1c872f0656 (diff) | |
Implementation of configuration.ccl spec from Yaakoub Y El-Khamra.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@3602 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.thornlib')
| -rw-r--r-- | lib/make/make.thornlib | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib index cc98eefe..45fa91ac 100644 --- a/lib/make/make.thornlib +++ b/lib/make/make.thornlib @@ -17,9 +17,17 @@ DIVIDER = $(DIVEL)$(DIVEL)$(DIVEL)$(DIVEL) # Include the main make definitions for this configuration include $(CONFIG)/make.config.defn + +# Include the configuration make.code.def for the thorn if it is not cactus or cactusbindings +INC_DIRS = +ifneq ($(THORN), CactusBindings) +ifneq ($(THORN), Cactus) +-include $(TOP)/bindings/Configuration/$(THORN)/make.configuration.defn +endif +endif # Add appropriate include lines -INC_DIRS = $(SYS_INC_DIRS) $(SRCDIR) $(SRCDIR)/include $(CONFIG) $(TOP)/bindings/include $(CCTK_HOME)/src/include $(CCTK_HOME)/arrangements +INC_DIRS += $(SYS_INC_DIRS) $(SRCDIR) $(SRCDIR)/include $(CONFIG) $(TOP)/bindings/include $(CCTK_HOME)/src/include $(CCTK_HOME)/arrangements # Allow subdirectories to inherit these include directories export INC_DIRS |