From 7aa4a180e48820e322067892214b9125279608b9 Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Sat, 2 Nov 2013 20:21:23 -0500 Subject: [svn-r24400] Maintenance: When the libraries are built and tested in place, several files are left behind by "make distclean" (see below); modified appropriate Makefile.am files and ran bin/reconfigure to create Makefile.in to fix the problem. Here is the list of the files "make disclean" doesn't remove: tools/h5dump/testfiles tools/h5repack/testfiles/h5diff_attr1.h5 tools/h5repack/testfiles/tfamily00000.h5 tools/h5repack/testfiles/tfamily00010.h5 tools/h5repack/testfiles/tfamily00002.h5 tools/h5repack/testfiles/tfamily00004.h5 tools/h5repack/testfiles/tfamily00006.h5 tools/h5repack/testfiles/tfamily00008.h5 tools/h5repack/testfiles/tfamily00001.h5 tools/h5repack/testfiles/tfamily00003.h5 tools/h5repack/testfiles/tfamily00005.h5 tools/h5repack/testfiles/tfamily00007.h5 tools/h5repack/testfiles/tfamily00009.h5 tools/h5jam/testfiles/h5jam-ub-nohdf5.txt.err-sav tools/h5jam/testfiles/h5jam-help.txt.err-sav tools/h5jam/testfiles/h5unjam-help.txt.err-sav tools/h5jam/testfiles/h5jam-ub-nohdf5.txt.out-sav tools/h5jam/testfiles/h5jam-help.txt.out-sav tools/h5jam/testfiles/h5unjam-help.txt.out-sav hl/fortran/test/dsetf5.h5 c++/test/tattr_multi.h5 c++/test/tattr_scalar.h5 c++/test/tfattrs.h5 c++/test/tattr_basic.h5 c++/test/tattr_compound.h5 c++/test/tattr_dtype.h5 Tested on jam and emu in place and using srcdir with the svn stat command. This fix doesn't address two problems: tool/h5dump/testfiles directory is not removed by "make distclean" and it should be tools/misc/testfiles directory is removed by "make distclean" and it shouldn't be --- c++/test/Makefile.am | 3 +++ c++/test/Makefile.in | 5 ++++- hl/fortran/test/Makefile.am | 2 +- hl/fortran/test/Makefile.in | 2 +- tools/h5jam/Makefile.am | 2 +- tools/h5jam/Makefile.in | 3 ++- tools/h5repack/Makefile.am | 2 +- tools/h5repack/Makefile.in | 3 ++- 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am index 687f0ca..3f62bda 100644 --- a/c++/test/Makefile.am +++ b/c++/test/Makefile.am @@ -51,5 +51,8 @@ mostlyclean-local: @if test -d ii_files; then \ $(RM) -rf ii_files; \ fi +# Temporary files +CHECK_CLEANFILES+=tattr_multi.h5 tfattrs.h5 tattr_scalar.h5 tattr_compound.h5 \ + tattr_dtype.h5 tattr_basic.h5 include $(top_srcdir)/config/conclude.am diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 3c4c645..0aad590 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -424,7 +424,10 @@ 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 +# Temporary files +CHECK_CLEANFILES = *.chkexe *.chklog *.clog tattr_multi.h5 tfattrs.h5 \ + tattr_scalar.h5 tattr_compound.h5 tattr_dtype.h5 \ + tattr_basic.h5 # Include src, test, and c++/src directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am index cd281b7..fa3a803 100644 --- a/hl/fortran/test/Makefile.am +++ b/hl/fortran/test/Makefile.am @@ -45,7 +45,7 @@ tstimage_SOURCES=tstimage.f90 tsttable_SOURCES=tsttable.f90 # Temporary files. -CHECK_CLEANFILES+=dsetf[1-4].h5 f1img.h5 f1tab.h5 tstds.h5 +CHECK_CLEANFILES+=dsetf[1-5].h5 f1img.h5 f1tab.h5 tstds.h5 # Mark this directory as part of the Fortran API (this affects output # from tests in conclude.am) diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 5d576d0..024cb0f 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -436,7 +436,7 @@ TRACE = perl $(top_srcdir)/bin/trace # *.clog are from the MPE option. # Temporary files. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog dsetf[1-4].h5 f1img.h5 \ +CHECK_CLEANFILES = *.chkexe *.chklog *.clog dsetf[1-5].h5 f1img.h5 \ f1tab.h5 tstds.h5 # Our main target, the test programs diff --git a/tools/h5jam/Makefile.am b/tools/h5jam/Makefile.am index c6ccebf..62a5ba7 100644 --- a/tools/h5jam/Makefile.am +++ b/tools/h5jam/Makefile.am @@ -39,7 +39,7 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5) # Temporary files. *.h5 are generated by jamgentest. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES+=*.h5 +CHECK_CLEANFILES+=*.h5 testfiles/h5jam-*-sav testfiles/h5unjam-*-sav DISTCLEANFILES=testh5jam.sh include $(top_srcdir)/config/conclude.am diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 7256d6e..c16c300 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -445,7 +445,8 @@ TRACE = perl $(top_srcdir)/bin/trace # Temporary files. *.h5 are generated by jamgentest. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 testfiles/h5jam-*-sav \ + testfiles/h5unjam-*-sav # Include src and tools/lib directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am index 663e501..eae296d 100644 --- a/tools/h5repack/Makefile.am +++ b/tools/h5repack/Makefile.am @@ -72,7 +72,7 @@ endif # Temporary files. *.h5 are generated by h5repack. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES+=*.h5 *.bin +CHECK_CLEANFILES+=*.h5 *.bin testfiles/h5diff_attr1.h5 testfiles/tfamily*.h5 DISTCLEANFILES=h5repack.sh h5repack_plugin.sh include $(top_srcdir)/config/conclude.am diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index fc37649..9f0e6f1 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -481,7 +481,8 @@ TRACE = perl $(top_srcdir)/bin/trace # Temporary files. *.h5 are generated by h5repack. They should # copied to the testfiles/ directory if update is required. -CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.bin +CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.bin \ + testfiles/h5diff_attr1.h5 testfiles/tfamily*.h5 # Include src, test, and tools/lib directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib -- cgit v0.12