diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-08-06 17:59:22 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-08-06 17:59:22 (GMT) |
| commit | 11e0151645566c9c94f11eca1556af6a316bd335 (patch) | |
| tree | e1ec62d370e49778f00efe8baf9f65f4cae302f6 /config/conclude.am | |
| parent | 6fb7471ecd106e022d7946ab140ebb47f85072bf (diff) | |
| download | hdf5-11e0151645566c9c94f11eca1556af6a316bd335.zip hdf5-11e0151645566c9c94f11eca1556af6a316bd335.tar.gz hdf5-11e0151645566c9c94f11eca1556af6a316bd335.tar.bz2 | |
Merge mostly CMake changes from develop and file cleanup
Diffstat (limited to 'config/conclude.am')
| -rw-r--r-- | config/conclude.am | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/config/conclude.am b/config/conclude.am index e6635d0..6e96ba2 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -16,11 +16,11 @@ ## Textually included at the end of most HDF5 Makefiles.am. ## Contains build rules. -# Automake needs to be taught how to build lib, dyn, progs, and tests targets. +# Automake needs to be taught how to build lib, progs and tests targets. # These will be filled in automatically for the most part (e.g., # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and # EXTRA_TEST variables are supplied to allow the user to force targets to -# be built at certain times. +# be built at certain times. LIB = $(lib_LIBRARIES) $(lib_LTLIBRARIES) $(noinst_LIBRARIES) \ $(noinst_LTLIBRARIES) $(check_LIBRARIES) $(check_LTLIBRARIES) $(EXTRA_LIB) PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS) \ @@ -32,6 +32,7 @@ TEST_EXTENSIONS = .sh SH_LOG_COMPILER = $(SHELL) AM_SH_LOG_FLAGS = REALTIMEOUTPUT = $(realtimeOutput) + # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) @@ -67,7 +68,7 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(chk_TESTS) # make install-doc doesn't do anything outside of doc directory, but # Makefiles should recognize it. # UPDATE: docs no longer reside in this build tree, so this target -# is depreciated. +# is deprecated. install-doc uninstall-doc: @echo "Nothing to be done." @@ -233,7 +234,7 @@ build-check-p: $(LIB) $(PROGS) $(chk_TESTS) echo "**** Hint ****"; \ echo "Parallel test files reside in the current directory" \ "by default."; \ - echo "Set HDF5_PARAPREFIX to use another directory. E.g.,"; \ + echo "Set HDF5_PARAPREFIX to use another directory. e.g.,"; \ echo " HDF5_PARAPREFIX=/PFS/user/me"; \ echo " export HDF5_PARAPREFIX"; \ echo " make check"; \ |