Merge pull request #245 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop

* commit '630d668954f56f5138f2bffe3994e2c1da2e3f5c':
  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.

7 files changed, 26 insertions, 20 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
diff --git a/tools/test/Makefile.am b/tools/test/Makefile.am
index 62193ba..db09003 100644
--- a/tools/test/Makefile.am
+++ b/tools/test/Makefile.am
@@ -24,7 +24,7 @@ include $(top_srcdir)/config/commence.am
 CONFIG=ordered
 
 # All subdirectories
-SUBDIRS=h5diff h5ls h5dump misc h5import h5repack h5jam h5copy h5stat \
-	perform
+SUBDIRS=h5diff h5ls h5dump misc h5import h5repack h5jam h5copy \
+	h5format_convert h5stat perform
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/test/h5format_convert/Makefile.am b/tools/test/h5format_convert/Makefile.am
index 5779d4d..f67b2ce 100644
--- a/tools/test/h5format_convert/Makefile.am
+++ b/tools/test/h5format_convert/Makefile.am
@@ -31,6 +31,8 @@ check_PROGRAMS=$(TEST_PROG) h5fc_chk_idx
 check_SCRIPTS=$(TEST_SCRIPT)
 SCRIPT_DEPEND=../../src/h5format_convert/h5format_convert$(EXEEXT)
 
+CLEANFILES=
+
 # Tell automake to clean h5redeploy script
 CHECK_CLEANFILES+=*.h5
 
diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c
index 520e5bf..fea7eed 100644
--- a/tools/test/h5format_convert/h5fc_gentest.c
+++ b/tools/test/h5format_convert/h5fc_gentest.c
@@ -296,7 +296,6 @@ error:
         H5Dclose(did2);
         H5Gclose(gid);
         H5Fclose(fcpl);
-        H5Fclose(fapl);
         H5Fclose(fid);
     } H5E_END_TRY;
 
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