diff options
| -rw-r--r-- | lib/make/make.thornlib | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/make/make.thornlib b/lib/make/make.thornlib index 45fa91ac..84223bda 100644 --- a/lib/make/make.thornlib +++ b/lib/make/make.thornlib @@ -18,22 +18,23 @@ 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 +BINDINGS_DIR=$(TOP)/bindings + +# Include the configuration make.code.defn 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 +-include $(BINDINGS_DIR)/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) $(BINDINGS_DIR)/include $(CCTK_HOME)/src/include $(CCTK_HOME)/arrangements # Allow subdirectories to inherit these include directories export INC_DIRS -BINDINGS_DIR=$(TOP)/bindings - EXTRA_DEFINES += THORN_IS_$(THORN) # Define some make variables |