summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2015-02-25 22:06:18 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2015-02-25 22:06:18 (GMT)
commit952d00e7f0f49c0895d937a3fed9abed4b25b7e1 (patch)
treefc5172f5729c61ba15c092d6c0e8f177c1d992a6 /examples
parent99a3f4d8d4ee1ec3f61a377c1a96a3fe35e9990a (diff)
parentc4044e0c85778e6bd3eda61b7bfdf6bb0fd0a8e9 (diff)
downloadhdf5-952d00e7f0f49c0895d937a3fed9abed4b25b7e1.zip
hdf5-952d00e7f0f49c0895d937a3fed9abed4b25b7e1.tar.gz
hdf5-952d00e7f0f49c0895d937a3fed9abed4b25b7e1.tar.bz2
[svn-r26306] Merge r26296 through 26304 from trunk to vds branch.
It should no longer be necessary to use --enable-using-memchecker make check fails due to an issue with h5ls apparently unrelated to the merge Tested: ummon
Diffstat (limited to 'examples')
-rw-r--r--examples/Makefile.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/Makefile.in b/examples/Makefile.in
index b54a6cc..05594cc 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -609,8 +609,9 @@ 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 $(EXTLINK_DIRS) *.h5
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 $(EXTLINK_DIRS) \
+ *.h5
@BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = ph5example
INSTALL_SCRIPT_FILES = run-c-ex.sh
INSTALL_TOP_SCRIPT_FILES = run-all-ex.sh