diff options
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/Makefile.am | 3 | ||||
| -rw-r--r-- | testpar/Makefile.in | 22 |
2 files changed, 14 insertions, 11 deletions
diff --git a/testpar/Makefile.am b/testpar/Makefile.am index b11678c..92985b8 100644 --- a/testpar/Makefile.am +++ b/testpar/Makefile.am @@ -40,7 +40,8 @@ LDADD = $(LIBHDF5) $(LIBH5TEST) # MPItest.h5 is from t_mpi # Para*.h5 are from testphdf # *.clog are from MPE option -MOSTLYCLEANFILES+=MPItest.h5 Para*.h5 *.clog +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 9940bfe..0ff5980 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -312,18 +312,16 @@ H5FC_PP = $(bindir)/h5pfc # On the other hand, it is very hard to specify the exact name of .chksh and # .logsh files because some scripts live in the source tree, not the build # tree. Thus, we clean all .logsh and .chksh files. -CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \ - $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \ - $(TEST_PROG_CHKEXE:.chkexe_=.log) \ - $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \ - *.chksh *.logsh - # Temporary files # MPItest.h5 is from t_mpi # Para*.h5 are from testphdf # *.clog are from MPE option -MOSTLYCLEANFILES = $(CHECK_CLEANFILES) MPItest.h5 Para*.h5 *.clog +CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \ + $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \ + $(TEST_PROG_CHKEXE:.chkexe_=.log) \ + $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) *.chksh *.logsh \ + MPItest.h5 Para*.h5 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test # Test programs and scripts. These are our main targets. @@ -337,6 +335,7 @@ 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. @@ -601,7 +600,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool + mostlyclean-libtool mostlyclean-local pdf: pdf-am @@ -622,8 +621,8 @@ uninstall-am: uninstall-info-am install-info-am install-man install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am + mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ + pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am # check-install is a synonym for installcheck. @@ -664,6 +663,9 @@ install-doc uninstall-doc: build-check-clean: $(RM) $(CHECK_CLEANFILES) +# run check-clean whenever mostlyclean is run +mostlyclean-local: build-check-clean + # Run each test in order, passing $(TEST_FLAGS) to the program. # Since tests are done in a shell loop, "make -i" does apply inside it. # Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop. |