summaryrefslogtreecommitdiffstats
path: root/tools/test/h5repack
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-01-11 20:24:09 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-01-11 20:24:09 (GMT)
commitee485247b7028bea18251ee0b22c918618652bec (patch)
treedd126712b61bfa9e56bdc020be1ab01f56edc60c /tools/test/h5repack
parent7fb991e8edd9cef200f4769bbd22e7eff2b9e27f (diff)
parent8b4c9f848d63351c85cab3a5b2034f8e7e1a29db (diff)
downloadhdf5-ee485247b7028bea18251ee0b22c918618652bec.zip
hdf5-ee485247b7028bea18251ee0b22c918618652bec.tar.gz
hdf5-ee485247b7028bea18251ee0b22c918618652bec.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '8b4c9f848d63351c85cab3a5b2034f8e7e1a29db': h5format_convert was not built (missing from subdirs in tools/src and tools/test Makefile.ams) but created dependencies that were not cleaned up by make clean and make distclean. Create h5repack convenience library for common code used by h5repack tool and h5repacktst. Fixes broken distclean. Added an --enable-developer-warnings option to configure so users can ignore -Wsuggest-attribute warnings and other noise that doesn't indicate poor code quality.
Diffstat (limited to 'tools/test/h5repack')
-rw-r--r--tools/test/h5repack/Makefile.am10
1 files changed, 3 insertions, 7 deletions
diff --git a/tools/test/h5repack/Makefile.am b/tools/test/h5repack/Makefile.am
index 6c045c4..5c284b3 100644
--- a/tools/test/h5repack/Makefile.am
+++ b/tools/test/h5repack/Makefile.am
@@ -37,16 +37,12 @@ endif
check_SCRIPTS=$(TEST_SCRIPT)
-# Depend on the hdf5 library, the tools library, the test library
-LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
+# Depend on the h5repack library, the hdf5 library, the tools library, the test library
+LDADD=../../src/h5repack/libh5repack.la $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
testh5repack_detect_szip_SOURCES=testh5repack_detect_szip.c
-# Source files
-COMMON_SOURCES=../../src/h5repack/h5repack.c ../../src/h5repack/h5repack_copy.c ../../src/h5repack/h5repack_filters.c \
- ../../src/h5repack/h5repack_opttable.c ../../src/h5repack/h5repack_parse.c ../../src/h5repack/h5repack_refs.c \
- ../../src/h5repack/h5repack_verify.c
-h5repacktst_SOURCES=$(COMMON_SOURCES) h5repacktst.c
+h5repacktst_SOURCES=h5repacktst.c
if HAVE_SHARED_CONDITIONAL