diff options
| author | lrknox <lrknox> | 2017-01-10 20:41:25 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2017-01-10 20:41:25 (GMT) |
| commit | 584d3743a830cb4514e61c73c8ca35c8e83f54b9 (patch) | |
| tree | 1b817f33dbe7882a1cebd99988a0d714b4cbd469 /tools | |
| parent | 969288e459f5db34c88853595c16824e25bf5e86 (diff) | |
| download | hdf5-584d3743a830cb4514e61c73c8ca35c8e83f54b9.zip hdf5-584d3743a830cb4514e61c73c8ca35c8e83f54b9.tar.gz hdf5-584d3743a830cb4514e61c73c8ca35c8e83f54b9.tar.bz2 | |
Create h5repack convenience library for common code used by h5repack
tool and h5repacktst. Fixes broken distclean.
Tested with h5committest and "make distclean".
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/src/h5repack/Makefile.am | 23 | ||||
| -rw-r--r-- | tools/test/h5repack/Makefile.am | 10 |
2 files changed, 17 insertions, 16 deletions
diff --git a/tools/src/h5repack/Makefile.am b/tools/src/h5repack/Makefile.am index e6e5a56..31d368d 100644 --- a/tools/src/h5repack/Makefile.am +++ b/tools/src/h5repack/Makefile.am @@ -23,20 +23,25 @@ include $(top_srcdir)/config/commence.am # Include src, test, and tools/lib directories AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib +# A convenience library for the h5repack tool and the h5repack tests +noinst_LTLIBRARIES=libh5repack.la + +libh5repack_la_SOURCES=h5repack.c h5repack_copy.c h5repack_filters.c \ + h5repack_opttable.c h5repack_parse.c h5repack_refs.c \ + h5repack_verify.c +libh5repack_la_LDFLAGS = $(AM_LDFLAGS) +libh5repack_la_LIBADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5) + + # Our main target, h5repack tool bin_PROGRAMS=h5repack +h5repack_SOURCES=h5repack_main.c + # Add h5repack specific linker flags here h5repack_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) -# Depend on the hdf5 library, the tools library, the test library -LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5) - -# Source files -COMMON_SOURCES=h5repack.c h5repack_copy.c h5repack_filters.c \ - h5repack_opttable.c h5repack_parse.c h5repack_refs.c \ - h5repack_verify.c - -h5repack_SOURCES=$(COMMON_SOURCES) h5repack_main.c +# Depend on the hdf5 library, the tools library, the h5repack library +h5repack_LDADD=libh5repack.la $(LIBH5TOOLS) $(LIBHDF5) include $(top_srcdir)/config/conclude.am 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 |