[svn-r21938] Fix for bad makefile clean code that removes hl/test/test_ld and hl/tools/h5watch .h5 files. These files are never regenerated and subsequent make checks after a clean will fail. This is just a temporary fix as the generator code and autotools files need a revisit.

5 files changed, 4 insertions, 5 deletions

diff --git a/configure b/configure
index 36f2428..f07fde3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 20408 2011-04-04 04:35:33Z koziol .
+# From configure.in Id: configure.in 21544 2011-10-13 13:28:44Z derobins .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for HDF5 1.9.81-FA_a5.
 #
diff --git a/hl/test/Makefile.am b/hl/test/Makefile.am
index 013db18..9bd5e7a 100644
--- a/hl/test/Makefile.am
+++ b/hl/test/Makefile.am
@@ -50,7 +50,7 @@ endif
 # Temporary files.  These files are the ones created by running `make test'.
 CHECK_CLEANFILES+=combine_tables[1-2].h5 test_ds[1-9].h5 test_image[1-3].h5 \
         test_lite[1-2].h5 test_table.h5 test_packet_table.h5                \
-        test_packet_compress.h5 test_detach.h5 test_ld.h5
+        test_packet_compress.h5 test_detach.h5
 DISTCLEANFILES=test_ld.sh
 
 include $(top_srcdir)/config/conclude.am
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index d0d9b25..54e4b12 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -441,7 +441,7 @@ TRACE = perl $(top_srcdir)/bin/trace
 CHECK_CLEANFILES = *.chkexe *.chklog *.clog combine_tables[1-2].h5 \
 	test_ds[1-9].h5 test_image[1-3].h5 test_lite[1-2].h5 \
 	test_table.h5 test_packet_table.h5 test_packet_compress.h5 \
-	test_detach.h5 test_ld.h5
+	test_detach.h5
 
 # Test script
 TEST_SCRIPT = test_ld.sh
diff --git a/hl/tools/h5watch/Makefile.am b/hl/tools/h5watch/Makefile.am
index 0bf7c1b..16dfe23 100644
--- a/hl/tools/h5watch/Makefile.am
+++ b/hl/tools/h5watch/Makefile.am
@@ -48,7 +48,6 @@ extend_dset_SOURCES=extend_dset.c
 # library.
 LDADD=$(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5)
 
-CHECK_CLEANFILES+=*.h5
 DISTCLEANFILES=testh5watch.sh
 
 include $(top_srcdir)/config/conclude.am
diff --git a/hl/tools/h5watch/Makefile.in b/hl/tools/h5watch/Makefile.in
index e00a0fa..3c67028 100644
--- a/hl/tools/h5watch/Makefile.in
+++ b/hl/tools/h5watch/Makefile.in
@@ -398,7 +398,7 @@ TRACE = perl $(top_srcdir)/bin/trace
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
 # *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src