[svn-r11323] Purpose:

tidy up.

Description:
MPE option created *.clog file whenever it is executed in MPI.
The cleanup of *.clog files were done in individual Makefile.in.
Often, it is forgotten.

Solution:
Moved the cleaning of *.clog files to CHECK_CLEANFILES in commence.am
so that it is applied whenever check-clean is called.

Platforms tested:
heping pp using MPE.

38 files changed, 87 insertions, 53 deletions

diff --git a/Makefile.in b/Makefile.in
index 496427e..89e3edc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -312,7 +312,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 @BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = 
 
 # Define subdirectories to build.
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 31c4e67..e8cf00f 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -282,7 +282,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 @BUILD_CXX_CONDITIONAL_TRUE@SUBDIRS = src test
 DIST_SUBDIRS = src test examples
 
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index c94a250..56092e6 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -274,11 +274,12 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # These are the files that 'make clean' (and derivatives) will remove from this
 # directory.  Since automake doesn't know about the examples, we need to
 # tell it to clean the example programs, too.
-CHECK_CLEANFILES = *.chkexe *.chklog *.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
 
 # Use h5c++ to build examples, instead of reguar C++ compiler
 H5CPP = $(bindir)/h5c++
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index b781a79..f475b6a 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -316,7 +316,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include src directory
 INCLUDES = -I$(top_srcdir)/src
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index b369f5e..b1098e5 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -305,7 +305,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include src, test, and c++/src directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
diff --git a/config/commence.am b/config/commence.am
index d2189c5..84eb1ba 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -55,7 +55,8 @@ AUTOCONF=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES=*.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES=*.chkexe *.chklog *.clog
 
 # check-install is a synonym for installcheck.
 # Add this build rule here (rather than in conclude.am, where build rules
diff --git a/examples/Makefile.am b/examples/Makefile.am
index e23603d..6143c6e 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -45,7 +45,7 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
           h5_reference.c h5_drivers.c ph5example.c
 
 # We need to tell automake what to clean
-MOSTLYCLEANFILES=*.raw *.meta *.clog *.o
+MOSTLYCLEANFILES=*.raw *.meta *.o
 CHECK_CLEANFILES+=*.h5
 CLEANFILES=$(TEST_PROG) $(TEST_PROG_PARA)
 
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 1867c08..10bf6e7 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -274,7 +274,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog *.h5
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
 @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example
 
 # Example programs.
@@ -300,7 +301,7 @@ INSTALL_FILES = h5_write.c h5_read.c h5_extend_write.c h5_chunk_read.c   \
 
 
 # We need to tell automake what to clean
-MOSTLYCLEANFILES = *.raw *.meta *.clog *.o
+MOSTLYCLEANFILES = *.raw *.meta *.o
 CLEANFILES = $(TEST_PROG) $(TEST_PROG_PARA)
 
 # How to install examples
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index ffc634c..b6fefc0 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -286,7 +286,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 @BUILD_PARALLEL_CONDITIONAL_TRUE@TESTPARALLEL_DIR = testpar
 
 # Subdirectories in build order, not including examples directory
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 9835d26..82199b9 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -274,7 +274,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Compile parallel fortran examples only if parallel is enabled
 @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 1525bb0..f91e7a8 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -341,7 +341,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include src directory in both Fortran and C flags (C compiler is used
 # for linking).
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 0685dbe..e232ef3 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -343,9 +343,10 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files
-CHECK_CLEANFILES = *.chkexe *.chklog *.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
 
 # Include files
 AM_FCFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 99d8a4c..c62ebee 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -298,9 +298,10 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files
-CHECK_CLEANFILES = *.chkexe *.chklog parf[12].h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog parf[12].h5
 
 # Include files
 AM_FCFLAGS = -I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src
diff --git a/hl/Makefile.in b/hl/Makefile.in
index f156cf2..7243ca5 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -278,7 +278,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 @BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran
 @BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++
 @BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src test $(CXX_DIR) $(FORTRAN_DIR)
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index e91980b..39e0faf 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -283,7 +283,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 SUBDIRS = src test
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 37015fe..faa0342 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -305,7 +305,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include src directory
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index eeeea8c..121a049 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -299,7 +299,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index b0eece3..33a7aa2 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -278,7 +278,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 SUBDIRS = src test
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 8aee289..0e9f952 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -299,7 +299,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
          -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
 
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index e69c90f..5249f89 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -298,9 +298,11 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files.
-CHECK_CLEANFILES = *.chkexe *.chklog dsetf[1-4].h5 f1img.h5 f1tab.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog dsetf[1-4].h5 f1img.h5 \
+	f1tab.h5
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/hl/src
 AM_FCFLAGS = -I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src
 
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 21a3449..55b8381 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -296,7 +296,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Add include directories to the C preprocessor flags
 AM_CPPFLAGS = -I$(top_srcdir)/src
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index c3acb78..cc1f609 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -308,9 +308,10 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files.  These files are the ones created by running `make test'.
-CHECK_CLEANFILES = *.chkexe *.chklog combine_tables[1-2].h5 \
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog combine_tables[1-2].h5 \
 	test_ds[1-6].h5 test_image[1-3].h5 test_lite[1-2].h5 \
 	test_table.h5 test_packet_table.h5
 
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index d023e61..29ad6ee 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -306,7 +306,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 3062c68..1892332 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -327,7 +327,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
 @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = h5perf
 
diff --git a/src/Makefile.in b/src/Makefile.in
index bef070c..19ebdb0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -342,7 +342,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
diff --git a/test/Makefile.in b/test/Makefile.in
index 0f562ce..a6d96c5 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -494,22 +494,24 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files.  These files are the ones created by setting the
 # HDF5_NOCLEANUP environment variable and running `make test' without
 # specifying a file prefix or low-level driver.  Changing the file
 # prefix or low-level driver with environment variables will influence 
 # the temporary file name in ways that the makefile is not aware of.
-CHECK_CLEANFILES = *.chkexe *.chklog cmpd_dset.h5 compact_dataset.h5 \
-	dataset.h5 extend.h5 istore.h5 tfile[1-4].h5 th5s[1-3].h5 \
-	lheap.h5 ohdr.h5 stab[1-2].h5 extern_[1-3].h5 \
-	extern_[1-4][ab].raw gheap[0-4].h5 dt_arith[1-2] links.h5 \
-	links[1-3].h5 big.data big[0-9][0-9][0-9][0-9][0-9].h5 \
-	dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 \
-	unlink.h5 unicode.h5 fillval_[0-9].h5 fillval.raw \
-	mount_[0-9].h5 testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 \
-	tvlstr.h5 tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 \
-	tarray1.h5 tgenprop.h5 tmisc[0-9]*.h5 set_extent_read.h5 \
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog cmpd_dset.h5 \
+	compact_dataset.h5 dataset.h5 extend.h5 istore.h5 \
+	tfile[1-4].h5 th5s[1-3].h5 lheap.h5 ohdr.h5 stab[1-2].h5 \
+	extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 \
+	dt_arith[1-2] links.h5 links[1-3].h5 big.data \
+	big[0-9][0-9][0-9][0-9][0-9].h5 dtypes[1-8].h5 \
+	dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 unlink.h5 \
+	unicode.h5 fillval_[0-9].h5 fillval.raw mount_[0-9].h5 \
+	testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 tvlstr.h5 \
+	tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 tarray1.h5 \
+	tgenprop.h5 tmisc[0-9]*.h5 set_extent_read.h5 \
 	set_extent_create.h5 getname.h5 getname[1-3].h5 sec2_file.h5 \
 	family_file000[0-3][0-9].h5 multi_file-[rs].h5 core_file \
 	new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 \
diff --git a/testpar/Makefile.am b/testpar/Makefile.am
index 7c4f567..5c66da1 100644
--- a/testpar/Makefile.am
+++ b/testpar/Makefile.am
@@ -39,9 +39,7 @@ LDADD = $(LIBHDF5) $(LIBH5TEST)
 # Temporary files
 # MPItest.h5 is from t_mpi
 # Para*.h5 are from testphdf
-# *.clog are from MPE option
 CHECK_CLEANFILES+=MPItest.h5 Para*.h5
-MOSTLYCLEANFILES=*.clog
 DISTCLEANFILES=go Makefile testph5.sh
 
 include $(top_srcdir)/config/conclude.am
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index 05a607d..02ffb8d 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -308,12 +308,12 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files
 # MPItest.h5 is from t_mpi
 # Para*.h5 are from testphdf
-# *.clog are from MPE option
-CHECK_CLEANFILES = *.chkexe *.chklog MPItest.h5 Para*.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog MPItest.h5 Para*.h5
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test
 
 # Test programs and scripts.  These are our main targets.
@@ -327,7 +327,6 @@ testphdf5_SOURCES = testphdf5.c t_dset.c t_file.c t_mdset.c t_ph5basic.c \
 
 # The tests all depend on the hdf5 library and the test library
 LDADD = $(LIBHDF5) $(LIBH5TEST)
-MOSTLYCLEANFILES = *.clog
 DISTCLEANFILES = go Makefile testph5.sh
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
@@ -543,7 +542,6 @@ install-strip:
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
 
diff --git a/tools/Makefile.in b/tools/Makefile.in
index a425c31..6a18ea0 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -283,7 +283,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # All subdirectories
 SUBDIRS = lib h5dump h5diff h5ls misc gifconv h5import h5repack h5jam
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index d023e61..29ad6ee 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -306,7 +306,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 6d248d7..003a92f 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -314,10 +314,12 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files.  *.h5 are generated by h5diff.  They should
 # be copied to the testfiles/ directory if update is required
-CHECK_CLEANFILES = *.chkexe *.chklog *.h5 expect_sorted actual_sorted
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 expect_sorted \
+	actual_sorted
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index cfcdec4..27fc54c 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -307,10 +307,11 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files.  *.h5 are generated by h5dumpgentest.  They should
 # copied to the testfiles/ directory if update is required.
-CHECK_CLEANFILES = *.chkexe *.chklog *.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
 
 # Include files in /src directory and /tools/lib directory
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 5ac6c17..bd016a1 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -307,7 +307,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 9f27f6e..3055f2f 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -302,10 +302,11 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files.  *.h5 are generated by jamgentest.  They should
 # copied to the testfiles/ directory if update is required.
-CHECK_CLEANFILES = *.chkexe *.chklog *.h5 *.txt
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.txt
 
 #
 # Copyright by the Board of Trustees of the University of Illinois.
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index aff5bab..1e04b32 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -300,7 +300,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include src and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 17d4e59..7886251 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -322,10 +322,11 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files.  *.h5 are generated by h5repack.  They should
 # copied to the testfiles/ directory if update is required.
-CHECK_CLEANFILES = *.chkexe *.chklog *.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
 
 # Include src, test, and tools/lib directories
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index fc8784d..e68d335 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -304,7 +304,8 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-CHECK_CLEANFILES = *.chkexe *.chklog
+# *.clog are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 
 # Include files in /src directory
 INCLUDES = -I$(top_srcdir)/src
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 66d49a5..10f0593 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -326,12 +326,13 @@ H5FC_PP = $(bindir)/h5pfc
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
+# *.clog are from the MPE option.
 
 # Temporary files.  *.h5 are generated by h5repart_gentest.  They should
 # copied to the testfiles/ directory if update is required. fst_family*.h5
 # and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable.
-CHECK_CLEANFILES = *.chkexe *.chklog *.h5 ../testfiles/fst_family*.h5 \
-	../testfiles/scd_family*.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 \
+	../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
 
 # Include src directory
 INCLUDES = -I$(top_srcdir)/src