diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-08-30 23:42:39 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-08-30 23:42:39 (GMT) |
| commit | 66af6dce17787f70e7bded57fdc63b1006ade754 (patch) | |
| tree | eb9ecc21bd4c265448324f9e192efac02fd841d8 /tools/h5repack | |
| parent | 70ddbda208079d6597e453b510f9bfa9320cf0bf (diff) | |
| download | hdf5-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/h5repack')
| -rw-r--r-- | tools/h5repack/Makefile.am | 2 | ||||
| -rw-r--r-- | tools/h5repack/Makefile.in | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am index 701eec3..794dd43 100644 --- a/tools/h5repack/Makefile.am +++ b/tools/h5repack/Makefile.am @@ -30,6 +30,8 @@ noinst_PROGRAMS=testh5repack_detect_szip check_SCRIPTS=$(TEST_SCRIPT) check_PROGRAMS=$(TEST_PROG) +SCRIPT_DEPEND=h5repack$(EXEEXT) + # Our main target, h5repack tool bin_PROGRAMS=h5repack diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index bda6e9c..17d4e59 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -334,6 +334,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib TEST_SCRIPT = h5repack.sh TEST_PROG = h5repacktst check_SCRIPTS = $(TEST_SCRIPT) +SCRIPT_DEPEND = h5repack$(EXEEXT) # All programs depend on the hdf5 library and the tools library LDADD = $(LIBH5TOOLS) $(LIBHDF5) @@ -796,7 +797,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}; \ |