diff options
author | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2008-07-25 23:56:25 +0000 |
---|---|---|
committer | schnetter <schnetter@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2008-07-25 23:56:25 +0000 |
commit | 0447746043dcb18a14df93491b377f0b38da5208 (patch) | |
tree | f01ac3d5aa38136209adcd252e0eac329a326b14 /lib/make/make.subdir | |
parent | 0f125ab402fbfda6cf97d0f5de9ac280df0b2de8 (diff) |
Re-read make.$(THORN).defn files from make.subdir, so that the make
variables which are set there are known when compiling.
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4499 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make/make.subdir')
-rw-r--r-- | lib/make/make.subdir | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/make/make.subdir b/lib/make/make.subdir index d51fc3bf..cf218a39 100644 --- a/lib/make/make.subdir +++ b/lib/make/make.subdir @@ -14,6 +14,19 @@ # Include the main make definitions for this configuration include $(CONFIG)/make.config.defn +BINDINGS_DIR=$(TOP)/bindings + +# Include the configuration make.THORN_NAME.defn for the thorn +# if it is not Cactus or CactusBindings +# (Note: This adds to INC_DIRS which is not necessary -- +# should we empty and completely re-set INC_DIRS here, +# instead of exporting it from make.thornlib?) +ifneq ($(THORN), CactusBindings) +ifneq ($(THORN), Cactus) +-include $(BINDINGS_DIR)/Configuration/Thorns/make.$(THORN).defn +endif +endif + # Add appropriate include lines INC_DIRS += $(SRCDIR) $(SRCDIR)/include |