diff options
| author | eschnett <eschnett@fb53df36-e548-4a1e-8150-ab98cbd5e786> | 2011-11-09 22:01:06 +0000 |
|---|---|---|
| committer | eschnett <eschnett@fb53df36-e548-4a1e-8150-ab98cbd5e786> | 2011-11-09 22:01:06 +0000 |
| commit | 81539d92d179303a08012cdc93c7f08543f880e0 (patch) | |
| tree | 9bafaa938cfe477cf19dcba6f5ea264a1e1f1b5c /src | |
| parent | 6947341cec40f8e4322d0be2736d104d642680bb (diff) | |
Update from upstream, and include HDF5 utilities
Update from upstream
Build and install HDF5 utilities.
Include HDF5 checker.
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/HDF5/trunk@45 fb53df36-e548-4a1e-8150-ab98cbd5e786
Diffstat (limited to 'src')
| -rw-r--r-- | src/make.configuration.defn | 3 | ||||
| -rw-r--r-- | src/make.configuration.deps | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/make.configuration.defn b/src/make.configuration.defn index 5c9bf8e..dd46bb1 100644 --- a/src/make.configuration.defn +++ b/src/make.configuration.defn @@ -1,7 +1,8 @@ -# make.configuration.defn file for thorn HDF5 +# make.configuration.defn file for thorn HDF5 # Define standard HDF5 utilities ALL_UTILS += gif2h5 h52gif h5copy h5debug h5diff h5dump h5import h5jam h5ls h5mkgrp h5perf_serial h5redeploy h5repack h5repart h5stat h5unjam +ALL_UTILS += h5check # Ignore some of the utilities that we don't use, e.g. the compiler # wrappers: diff --git a/src/make.configuration.deps b/src/make.configuration.deps index 6d0d250..f0e5b70 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -1,4 +1,4 @@ -# make.configuration.deps file for thorn HDF5 +# make.configuration.deps file for thorn HDF5 # Standard HDF5 utilities are copied from the install directory @@ -23,7 +23,7 @@ HDF5_LDFLAGS = $(DEBUG_LD) $(LDFLAGS) $(EXTRAFLAGS) $(GENERAL_LIBRARIES) $(HDF5_BUILD_DIR)/%.o: $(HDF5_SRC_DIR)/%.c @echo "Compiling $<" -$(MKDIR) $(MKDIRFLAGS) $(HDF5_BUILD_DIR) 2> /dev/null - $(CC) $< $(HDF5_CFLAGS) -c -o $@ + $(CC) $< $(HDF5_CFLAGS) -DTHORN_IS_HDF5 -c -o $@ # Link $(UTIL_DIR)/%: $(HDF5_BUILD_DIR)/%.o |