aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@fb53df36-e548-4a1e-8150-ab98cbd5e786>2011-02-01 16:17:33 +0000
committereschnett <eschnett@fb53df36-e548-4a1e-8150-ab98cbd5e786>2011-02-01 16:17:33 +0000
commita0a99cffa3a7f9a6be28bcc6a67a064b99d7e485 (patch)
tree4d08085372eb89ce29dea73ed486b901a29aae8c
parent4bbde53cb403246e7a83205679f4ea0e8e9d3a18 (diff)
Install the standard HDF5 utilities as well
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@32 fb53df36-e548-4a1e-8150-ab98cbd5e786
-rw-r--r--src/make.configuration.defn3
-rw-r--r--src/make.configuration.deps11
2 files changed, 14 insertions, 0 deletions
diff --git a/src/make.configuration.defn b/src/make.configuration.defn
index 86f52ea..b00c73a 100644
--- a/src/make.configuration.defn
+++ b/src/make.configuration.defn
@@ -1,4 +1,7 @@
# make.configuration.defn file for thorn HDF5
+# Define standard HDF5 utilities
+ALL_UTILS += gif2h5 h52gif h5c++ h5cc h5copy h5debug h5diff h5dump h5fc h5import h5jam h5ls h5mkgrp h5perf_serial h5redeploy h5repack h5repart h5stat h5unjam
+
# Define this thorn's utilities
ALL_UTILS += hdf5_merge hdf5_extract hdf5_double_to_single
diff --git a/src/make.configuration.deps b/src/make.configuration.deps
index 402c629..6d0d250 100644
--- a/src/make.configuration.deps
+++ b/src/make.configuration.deps
@@ -1,5 +1,16 @@
# make.configuration.deps file for thorn HDF5
+# Standard HDF5 utilities are copied from the install directory
+
+$(UTIL_DIR)/%: $(HDF5_DIR)/bin/%
+ @echo "Copying $* from $< to $(UTIL_DIR)"
+ -$(MKDIR) $(MKDIRFLAGS) $(UTIL_DIR) 2> /dev/null
+ cp $< $@
+
+
+
+# Cactus HDF5 utilities are built
+
HDF5_BUILD_DIR = $(BUILD_DIR)/HDF5
HDF5_SRC_DIR = $(PACKAGE_DIR)/ExternalLibraries/HDF5/src/util