[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:

17 files changed, 25 insertions, 10 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index ea80007..a425c31 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -731,7 +731,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}; \
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 24cdd44..d023e61 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -732,7 +732,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}; \
diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am
index 865d9af..fc2a08d 100644
--- a/tools/h5diff/Makefile.am
+++ b/tools/h5diff/Makefile.am
@@ -38,6 +38,7 @@ TEST_SCRIPT=$(srcdir)/testh5diff.sh
 
 check_PROGRAMS=$(TEST_PROG)
 check_SCRIPTS=$(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
+SCRIPT_DEPEND=h5diff$(EXEEXT)
 
 # Source files for the program
 h5diff_SOURCES=h5diff_main.c h5diff_common.c
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 6b19b3c..6d248d7 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -331,6 +331,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 TEST_PROG = h5difftst
 TEST_SCRIPT = $(srcdir)/testh5diff.sh
 check_SCRIPTS = $(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
+SCRIPT_DEPEND = h5diff$(EXEEXT)
 
 # Source files for the program
 h5diff_SOURCES = h5diff_main.c h5diff_common.c
@@ -770,7 +771,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}; \
diff --git a/tools/h5dump/Makefile.am b/tools/h5dump/Makefile.am
index c9c1e4d..85b1443 100644
--- a/tools/h5dump/Makefile.am
+++ b/tools/h5dump/Makefile.am
@@ -28,6 +28,7 @@ TEST_SCRIPT=testh5dump.sh $(srcdir)/testh5dumpxml.sh
 
 check_PROGRAMS=$(TEST_PROG)
 check_SCRIPTS=$(TEST_SCRIPT)
+SCRIPT_DEPEND=h5dump$(EXEEXT)
 
 # Our main target, the h5dump tool.
 bin_PROGRAMS=h5dump
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 2a822a1..cfcdec4 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -319,6 +319,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 TEST_PROG = h5dumpgentest
 TEST_SCRIPT = testh5dump.sh $(srcdir)/testh5dumpxml.sh
 check_SCRIPTS = $(TEST_SCRIPT)
+SCRIPT_DEPEND = h5dump$(EXEEXT)
 
 # All the programs depend on the hdf5 and h5tools libraries
 LDADD = $(LIBH5TOOLS) $(LIBHDF5)
@@ -746,7 +747,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}; \
diff --git a/tools/h5import/Makefile.am b/tools/h5import/Makefile.am
index df59068..7144b5e 100644
--- a/tools/h5import/Makefile.am
+++ b/tools/h5import/Makefile.am
@@ -28,6 +28,7 @@ TEST_SCRIPT=$(srcdir)/h5importtestutil.sh
 
 check_PROGRAMS=$(TEST_PROG)
 check_SCRIPT=h5importtestutil.sh
+SCRIPT_DEPEND=h5import$(EXEEXT)
 
 # Our main targets
 bin_PROGRAMS=h5import
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 72fde7d..5ac6c17 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -316,6 +316,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 TEST_PROG = h5importtest
 TEST_SCRIPT = $(srcdir)/h5importtestutil.sh
 check_SCRIPT = h5importtestutil.sh
+SCRIPT_DEPEND = h5import$(EXEEXT)
 
 # All programs depend on the main hdf5 library and the tools library
 LDADD = $(LIBHDF5) $(LIBH5TOOLS)
@@ -739,7 +740,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}; \
diff --git a/tools/h5jam/Makefile.am b/tools/h5jam/Makefile.am
index a6bbfbb..d29ffd0 100644
--- a/tools/h5jam/Makefile.am
+++ b/tools/h5jam/Makefile.am
@@ -26,6 +26,7 @@ check_PROGRAMS=tellub h5jamgentest getub
 TEST_SCRIPT=testh5jam.sh
 
 check_SCRIPTS=$(TEST_SCRIPT)
+SCRIPT_DEPEND=h5jam$(EXEEXT) h5unjam$(EXEEXT)
 
 # Link against the main HDF5 library and tools library
 LDADD=$(LIBH5TOOLS) $(LIBHDF5)
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index e79995d..9f27f6e 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -327,6 +327,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.h5 *.txt
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
 TEST_SCRIPT = testh5jam.sh
 check_SCRIPTS = $(TEST_SCRIPT)
+SCRIPT_DEPEND = h5jam$(EXEEXT) h5unjam$(EXEEXT)
 
 # Link against the main HDF5 library and tools library
 LDADD = $(LIBH5TOOLS) $(LIBHDF5)
@@ -766,7 +767,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}; \
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}; \
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}; \
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index a200619..fc8784d 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -736,7 +736,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}; \
diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am
index 2eadd50..b6bf039 100644
--- a/tools/misc/Makefile.am
+++ b/tools/misc/Makefile.am
@@ -28,6 +28,7 @@ TEST_SCRIPT=testh5repart.sh
 
 check_PROGRAMS=$(TEST_PROG) repart_test
 check_SCRIPTS=$(TEST_SCRIPT)
+SCRIPT_DEPEND=h5repart$(EXEEXT)
 
 # Build pdb2hdf5 if LLNL's PDB is present (checked in configure)
 if BUILD_PDB2HDF_CONDITIONAL
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 2ffbd3a..66d49a5 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -340,6 +340,7 @@ INCLUDES = -I$(top_srcdir)/src
 TEST_PROG = h5repart_gentest
 TEST_SCRIPT = testh5repart.sh
 check_SCRIPTS = $(TEST_SCRIPT)
+SCRIPT_DEPEND = h5repart$(EXEEXT)
 
 # Build pdb2hdf5 if LLNL's PDB is present (checked in configure)
 @BUILD_PDB2HDF_CONDITIONAL_TRUE@PDB2HDF = pdb2hdf5
@@ -828,7 +829,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}; \