summaryrefslogtreecommitdiffstats
path: root/tools/h5ls
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-08-30 23:42:39 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-08-30 23:42:39 (GMT)
commit66af6dce17787f70e7bded57fdc63b1006ade754 (patch)
treeeb9ecc21bd4c265448324f9e192efac02fd841d8 /tools/h5ls
parent70ddbda208079d6597e453b510f9bfa9320cf0bf (diff)
downloadhdf5-66af6dce17787f70e7bded57fdc63b1006ade754.zip
hdf5-66af6dce17787f70e7bded57fdc63b1006ade754.tar.gz
hdf5-66af6dce17787f70e7bded57fdc63b1006ade754.tar.bz2
[svn-r11319] Purpose:
Bug fixes Description: This checkin fixes an occasional error on kelgia on sol during distclean. It also causes test scripts to depend properly on the programs they're supposed to be testing. Solution: The kelgia bug was due to some files being cleaned by automake and manually. Removed the manual cleaning in src/Makefile.am. Test script dependencies now need to be specified manually, since the makefile can't guess what they test from their name. Currently all test scripts in a given directory have a single list of dependencies--this was easy and seems to be sufficient. These dependencies are listed in the SCRIPT_DEPEND variable in the Makefile.am. Platforms tested: heping, mir, modi4, sol Misc. update:
Diffstat (limited to 'tools/h5ls')
-rw-r--r--tools/h5ls/Makefile.am1
-rw-r--r--tools/h5ls/Makefile.in3
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/h5ls/Makefile.am b/tools/h5ls/Makefile.am
index 89a83a1..7d3e1e7 100644
--- a/tools/h5ls/Makefile.am
+++ b/tools/h5ls/Makefile.am
@@ -25,6 +25,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_SCRIPT=$(srcdir)/testh5ls.sh
check_SCRIPTS=$(TEST_SCRIPT)
+SCRIPT_DEPEND=h5ls$(EXEEXT)
# This is our main target, the h5ls tool
bin_PROGRAMS=h5ls
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 625779a..aff5bab 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -308,6 +308,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_SCRIPT = $(srcdir)/testh5ls.sh
check_SCRIPTS = $(TEST_SCRIPT)
+SCRIPT_DEPEND = h5ls$(EXEEXT)
# All programs depend on the hdf5 and h5tools libraries
LDADD = $(LIBH5TOOLS) $(LIBHDF5)
@@ -719,7 +720,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
tname=`basename $(@:.chkexe_=)`;\
log=`basename $(@:.chkexe_=.chklog)`; \
echo "============================"; \
- if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \
+ if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \
echo "No need to test $${tname} again."; \
else \
echo "============================" > $${log}; \