diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 12 |
3 files changed, 4 insertions, 15 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8edffdb..9a8b276 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -773,9 +773,6 @@ if (BUILD_TESTING) add_subdirectory (${HDF5_SOURCE_DIR}/tools/lib ${PROJECT_BINARY_DIR}/tools/lib) add_subdirectory (${HDF5_SOURCE_DIR}/test ${PROJECT_BINARY_DIR}/test) endif (EXISTS "${HDF5_SOURCE_DIR}/test" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/test") -# if (EXISTS "${HDF5_SOURCE_DIR}/perform" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/perform") -# add_subdirectory (${HDF5_SOURCE_DIR}/perform ${PROJECT_BINARY_DIR}/perform) -# endif (EXISTS "${HDF5_SOURCE_DIR}/perform" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/perform") if (H5_HAVE_PARALLEL) if (EXISTS "${HDF5_SOURCE_DIR}/testpar" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/testpar") add_subdirectory (${HDF5_SOURCE_DIR}/testpar ${PROJECT_BINARY_DIR}/testpar) diff --git a/Makefile.am b/Makefile.am index aaa3b9a..0bef022 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,7 +79,7 @@ DIST_SUBDIRS = src test testpar tools . c++ fortran hl examples # Some files generated during configure that should be cleaned DISTCLEANFILES=config/stamp1 config/stamp2 -# Some files/directories generated during checkperform that should be cleaned +# Some files/directories generated during check that should be cleaned CHECK_CLEANFILES+=*-tmp # Define rules for lib, progs, check, and tests. @@ -93,7 +93,7 @@ lib progs check-p check-s: fi; \ done -# Make all, tests, and (un)install also recurse into directory +# Make all, tests, and (un)install tests: @@SETX@; for d in $(SUBDIRS); do \ if test $$d != .; then \ diff --git a/Makefile.in b/Makefile.in index e7fcf48..670bbde 100644 --- a/Makefile.in +++ b/Makefile.in @@ -503,7 +503,7 @@ TRACE = perl $(top_srcdir)/bin/trace # .chklog files are output from those tests. # *.clog are from the MPE option. -# Some files/directories generated during checkperform that should be cleaned +# Some files/directories generated during check that should be cleaned CHECK_CLEANFILES = *.chkexe *.chklog *.clog *-tmp @BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = @@ -1017,10 +1017,7 @@ lib progs check-p check-s: fi; \ done -# Make all, tests, and (un)install also recurse into directory -#delall-local: -#del @cd perform && $(MAKE) $(AM_MAKEFLAGS) all -#del +# Make all, tests, and (un)install tests: @@SETX@; for d in $(SUBDIRS); do \ if test $$d != .; then \ @@ -1028,11 +1025,6 @@ tests: fi; \ done -#delinstall-exec-local: -#del @cd perform && $(MAKE) $(AM_MAKEFLAGS) install -#deluninstall-local: -#del @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall -#del # Check-clean also recurses into examples directory check-clean: @@SETX@; for d in $(SUBDIRS) examples; do \ |