diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-01-11 20:24:09 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-01-11 20:24:09 (GMT) |
| commit | ee485247b7028bea18251ee0b22c918618652bec (patch) | |
| tree | dd126712b61bfa9e56bdc020be1ab01f56edc60c /tools/src | |
| parent | 7fb991e8edd9cef200f4769bbd22e7eff2b9e27f (diff) | |
| parent | 8b4c9f848d63351c85cab3a5b2034f8e7e1a29db (diff) | |
| download | hdf5-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/src')
| -rw-r--r-- | tools/src/Makefile.am | 3 | ||||
| -rw-r--r-- | tools/src/h5format_convert/Makefile.am | 3 | ||||
| -rw-r--r-- | tools/src/h5repack/Makefile.am | 23 |
3 files changed, 19 insertions, 10 deletions
diff --git a/tools/src/Makefile.am b/tools/src/Makefile.am index 0cea969..358ac6b 100644 --- a/tools/src/Makefile.am +++ b/tools/src/Makefile.am @@ -24,6 +24,7 @@ include $(top_srcdir)/config/commence.am CONFIG=ordered # All subdirectories -SUBDIRS=h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat +SUBDIRS=h5diff h5ls h5dump misc h5import h5repack h5jam h5copy \ + h5format_convert h5stat include $(top_srcdir)/config/conclude.am diff --git a/tools/src/h5format_convert/Makefile.am b/tools/src/h5format_convert/Makefile.am index e2d1acf..35f9e68 100644 --- a/tools/src/h5format_convert/Makefile.am +++ b/tools/src/h5format_convert/Makefile.am @@ -25,6 +25,7 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # These are our main targets, the tools bin_PROGRAMS=h5format_convert +bin_SCRIPTS= # Add h5format_convert specific linker flags here h5format_convert_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) @@ -32,4 +33,6 @@ h5format_convert_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) # All programs rely on hdf5 library and h5tools library LDADD=$(LIBH5TOOLS) $(LIBHDF5) +CLEANFILES= + include $(top_srcdir)/config/conclude.am 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 |