summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-01-10 22:53:38 (GMT)
committerlrknox <lrknox>2017-01-10 22:53:38 (GMT)
commit630d668954f56f5138f2bffe3994e2c1da2e3f5c (patch)
tree71599edbbbbc3df9e8381a5db12673ee3b9c3d47
parentfa75b666db0e9448b4ce971d37d84914e22453ea (diff)
downloadhdf5-630d668954f56f5138f2bffe3994e2c1da2e3f5c.zip
hdf5-630d668954f56f5138f2bffe3994e2c1da2e3f5c.tar.gz
hdf5-630d668954f56f5138f2bffe3994e2c1da2e3f5c.tar.bz2
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.
-rw-r--r--tools/src/Makefile.am3
-rw-r--r--tools/src/h5format_convert/Makefile.am3
-rw-r--r--tools/test/Makefile.am4
-rw-r--r--tools/test/h5format_convert/Makefile.am2
-rw-r--r--tools/test/h5format_convert/h5fc_gentest.c1
5 files changed, 9 insertions, 4 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/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;