diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2019-12-24 21:12:08 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2019-12-24 21:12:08 (GMT) |
commit | 5b9cf732caab9daa6ed1e00f2df4f5a792340196 (patch) | |
tree | 4c01c9bd71ba5e7d8d11b474f6896e6ffbf0416d /hl/tools/h5watch/Makefile.in | |
parent | 646fc294078f560fc9bef784cb1c4e27cdc51f5b (diff) | |
parent | e0fa36bfe008c03365ce8ea94d705f8fdebccdf0 (diff) | |
download | hdf5-5b9cf732caab9daa6ed1e00f2df4f5a792340196.zip hdf5-5b9cf732caab9daa6ed1e00f2df4f5a792340196.tar.gz hdf5-5b9cf732caab9daa6ed1e00f2df4f5a792340196.tar.bz2 |
Merge pull request #2203 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:1.10/master to 1.10/masterhdf5-1_10_6
* commit 'e0fa36bfe008c03365ce8ea94d705f8fdebccdf0': (166 commits)
Update release date strings in README.txt and release_docs/RELEASE.txt
Add release note about using ompio instead of romio when collective writes fail with OpenMPI.
Fixed typos, grammatical errors, etc. Expanded entry for S3 and HDFS VFDs. Moved Mac 10.11 and 10.12 from Supported Platforms to More Platforms Tested.
Add qualification to RELEASE.txt regarding performance improvements
Standalone doesn't use h5test implementation.
Add missing note
Update COPYING file with new HDF5 license.
Update bin/config.guess and config.sub to current version available from git.savannah.gnu.org.
Fix include to correct memory calls - big-endian issue.
Revert BLDLIBDIR value in junit.sh.in.
Corrections to CMake functions
Update version for HDF5 1.10.6 release. Remove autom4te.cache directory that shouldn't have been added.
Remove duplicate instance
Fix merge issue
HDFFV-10979 - fix global name clash
Correct clang search and java include
Latest date first in RELEASE.txt
Update RELEASE.txt with performance improvements and Steven Varga's bugfix.
Update version numbers for shared lib files according to api compatibility report.
Created hdf5_1_10_6 branch for HDF5 1.10.6 release preparation. Set version to 1.10.6-pre1. Switched default maintainer mode to disabled and default build mode to production. Added files produced by autogen.sh to commit except for src/H5config.h.in~ and src/H5public.h~.
...
Diffstat (limited to 'hl/tools/h5watch/Makefile.in')
-rw-r--r-- | hl/tools/h5watch/Makefile.in | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/hl/tools/h5watch/Makefile.in b/hl/tools/h5watch/Makefile.in index ffc0277..e5ac094 100644 --- a/hl/tools/h5watch/Makefile.in +++ b/hl/tools/h5watch/Makefile.in @@ -104,8 +104,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = h5watch$(EXEEXT) -noinst_PROGRAMS = swmr_check_compat_vfd$(EXEEXT) \ - h5watchgentest$(EXEEXT) extend_dset$(EXEEXT) +noinst_PROGRAMS = swmr_check_compat_vfd$(EXEEXT) $(am__EXEEXT_1) +@BUILD_TESTS_CONDITIONAL_TRUE@am__append_1 = -I$(top_srcdir)/hl/test +@BUILD_TESTS_CONDITIONAL_TRUE@am__append_2 = h5watchgentest extend_dset TESTS = $(TEST_SCRIPT) subdir = hl/tools/h5watch ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -136,10 +137,13 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h \ CONFIG_CLEAN_FILES = testh5watch.sh CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" +@BUILD_TESTS_CONDITIONAL_TRUE@am__EXEEXT_1 = h5watchgentest$(EXEEXT) \ +@BUILD_TESTS_CONDITIONAL_TRUE@ extend_dset$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) extend_dset_SOURCES = extend_dset.c extend_dset_OBJECTS = extend_dset-extend_dset.$(OBJEXT) -extend_dset_DEPENDENCIES = $(LDADD) $(LIBH5TEST) $(LIBHDF5) +@BUILD_TESTS_CONDITIONAL_TRUE@extend_dset_DEPENDENCIES = $(LDADD) \ +@BUILD_TESTS_CONDITIONAL_TRUE@ $(LIBH5TEST) $(LIBHDF5) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -441,7 +445,7 @@ AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ # Include src and tools/lib directories AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \ -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src \ - -I$(top_srcdir)/hl/test + $(am__append_1) AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ @@ -502,7 +506,6 @@ FC_VERSION = @FC_VERSION@ FGREP = @FGREP@ FORTRAN_C_LONG_DOUBLE_IS_UNIQUE = @FORTRAN_C_LONG_DOUBLE_IS_UNIQUE@ FORTRAN_HAVE_C_LONG_DOUBLE = @FORTRAN_HAVE_C_LONG_DOUBLE@ -FORTRAN_SIZEOF_LONG_DOUBLE = @FORTRAN_SIZEOF_LONG_DOUBLE@ FSEARCH_DIRS = @FSEARCH_DIRS@ Fortran_COMPILER_ID = @Fortran_COMPILER_ID@ GREP = @GREP@ @@ -525,9 +528,12 @@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ HAVE_Fortran_INTEGER_SIZEOF_16 = @HAVE_Fortran_INTEGER_SIZEOF_16@ +HAVE_LIBHDFS = @HAVE_LIBHDFS@ HAVE_PTHREAD = @HAVE_PTHREAD@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ +HDF5_TESTS = @HDF5_TESTS@ +HDF5_TOOLS = @HDF5_TOOLS@ HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HDF_JAVA = @HDF_JAVA@ @@ -554,6 +560,7 @@ JAVA_JUNIT = @JAVA_JUNIT@ JAVA_PATH_NAME = @JAVA_PATH_NAME@ JAVA_VERSION = @JAVA_VERSION@ JNIFLAGS = @JNIFLAGS@ +JNI_LDFLAGS = @JNI_LDFLAGS@ JUNIT = @JUNIT@ LARGE_PARALLEL_IO = @LARGE_PARALLEL_IO@ LD = @LD@ @@ -608,6 +615,7 @@ PREADWRITE = @PREADWRITE@ PROFILING = @PROFILING@ RANLIB = @RANLIB@ ROOT = @ROOT@ +ROS3_VFD = @ROS3_VFD@ RUNPARALLEL = @RUNPARALLEL@ RUNSERIAL = @RUNSERIAL@ R_INTEGER = @R_INTEGER@ @@ -632,7 +640,6 @@ UNAME_INFO = @UNAME_INFO@ USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@ USE_FILTER_SZIP = @USE_FILTER_SZIP@ USINGMEMCHECKER = @USINGMEMCHECKER@ -UUDECODE = @UUDECODE@ VERSION = @VERSION@ WORDS_BIGENDIAN = @WORDS_BIGENDIAN@ _ACJNI_JAVAC = @_ACJNI_JAVAC@ @@ -748,28 +755,20 @@ 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 and *.clog2 are from the MPE option. - # CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 -# These are our main targets, the tools -TEST_SCRIPT = testh5watch.sh -check_SCRIPTS = $(TEST_SCRIPT) -SCRIPT_DEPEND = swmr_check_compat_vfd$(EXEEXT) extend_dset$(EXEEXT) h5watch$(EXEEXT) - # Add h5watch specific linker flags here h5watch_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) # Programs all depend on the hdf5 library, the tools library, and the HL # library. LDADD = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5) - -# Add extend_dset specific preprocessor flags here -# (add the main test subdirectory to the include file path) -extend_dset_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/test -# Add extend_dset specific library flags here -# (add the main test library to the list of libraries) -extend_dset_LDADD = $(LDADD) $(LIBH5TEST) $(LIBHDF5) +@BUILD_TESTS_CONDITIONAL_TRUE@TEST_SCRIPT = testh5watch.sh +@BUILD_TESTS_CONDITIONAL_TRUE@check_SCRIPTS = $(TEST_SCRIPT) +@BUILD_TESTS_CONDITIONAL_TRUE@SCRIPT_DEPEND = swmr_check_compat_vfd$(EXEEXT) extend_dset$(EXEEXT) h5watch$(EXEEXT) +@BUILD_TESTS_CONDITIONAL_TRUE@extend_dset_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/test +@BUILD_TESTS_CONDITIONAL_TRUE@extend_dset_LDADD = $(LDADD) $(LIBH5TEST) $(LIBHDF5) DISTCLEANFILES = testh5watch.sh # Automake needs to be taught how to build lib, progs and tests targets. @@ -1330,6 +1329,10 @@ uninstall-am: uninstall-binPROGRAMS help: @$(top_srcdir)/bin/makehelp +@BUILD_TESTS_CONDITIONAL_TRUE@ # Add extend_dset specific preprocessor flags here +@BUILD_TESTS_CONDITIONAL_TRUE@ # (add the main test subdirectory to the include file path) +@BUILD_TESTS_CONDITIONAL_TRUE@ # Add extend_dset specific library flags here +@BUILD_TESTS_CONDITIONAL_TRUE@ # (add the main test library to the list of libraries) # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. @@ -1366,7 +1369,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." |