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

1 files changed, 2 insertions, 1 deletions

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}; \