mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

h5format_convert was not built (missing from subdirs in tools/src and

Browse Source 
tools/test Makefile.ams) but created dependencies that were not
cleaned up by make clean and make distclean.
This commit is contained in:
lrknox 2017-01-10 16:53:38 -06:00
parent fa75b666db
commit 630d668954
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/src/Makefile.am
View File

@ -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

3
tools/src/h5format_convert/Makefile.am
View File

@ -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

4
tools/test/Makefile.am
View File

@ -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

2
tools/test/h5format_convert/Makefile.am
View File

@ -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

1
tools/test/h5format_convert/h5fc_gentest.c
View File

@ -296,7 +296,6 @@ error:
H5Dclose(did2);
H5Gclose(gid);
H5Fclose(fcpl);
H5Fclose(fapl);
H5Fclose(fid);
} H5E_END_TRY;