summaryrefslogtreecommitdiff
path: root/lib/make
diff options
context:
space:
mode:
authoreschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>2010-12-23 20:23:30 +0000
committereschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac>2010-12-23 20:23:30 +0000
commitaa5e6558158480ab3983beb4daa1fdadeac95410 (patch)
tree711d141ce2e4351e3a0fe66350dd215801fd336b /lib/make
parent9df8577df5231aa503dafb265ba1698e294029be (diff)
Improve optional requirement of capabilities
Thorns can specify that they can make use of a particular capability (for example HDF5), but that it is not absolutely required. It is currently not possible to detect a capability in the source code or make system of a thorn because there is no preprocessor macro and no make variable defined to indicate that the capability is available. Additionally, the preprocessor definitions which are explicitly provided by a capability are written to an include file which is malformed and hence these definitions cannot be read. This commit: * Introduces makefile and preprocessor variables HAVE_CAPABILITY_<cap> for each provided capability * Removes the incorrect definition line causing the include file to be malformed * Renames cctki_Capabilities.h to cctk_Capabilities.h and causes cctk_Capabilities.h to be included from cctk.h by all thorns * Excludes cctk_Capabilities.h from dependency checking (dependencies of the files included from this one will be sufficient) [Patch from Ian Hinder] git-svn-id: http://svn.cactuscode.org/flesh/trunk@4659 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/make')
-rw-r--r--lib/make/make.config.defn.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/make/make.config.defn.in b/lib/make/make.config.defn.in
index 47f4cbe3..ebce0c5c 100644
--- a/lib/make/make.config.defn.in
+++ b/lib/make/make.config.defn.in
@@ -151,7 +151,7 @@ export F90_POSTPROCESSING = @F90_POSTPROCESSING@
export USE_RANLIB = @USE_RANLIB@
# Exclude some files from the dependency lists
-export DEP_EXCLUDE_FILES = cctk_Functions\.h|CParameterStructNames\.h|cctk_Arguments\.h|definethisthorn\.h|FParameters.h|CParameters\.h
+export DEP_EXCLUDE_FILES = cctk_Functions\.h|CParameterStructNames\.h|cctk_Arguments\.h|definethisthorn\.h|FParameters.h|CParameters\.h|cctk_Capabilities\.h
# Command used to get the working directory
export GET_WD = @GET_WD@