diff options
60 files changed, 277 insertions, 31 deletions
diff --git a/Makefile.in b/Makefile.in index 81f68a4..4f4e6bb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -226,6 +226,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/c++/Makefile.in b/c++/Makefile.in index a42274a..d225875 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -191,6 +191,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 49bd404..ad240a4 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -158,6 +158,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ @@ -407,11 +408,11 @@ EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c++ # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. -EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # We need to tell automake what to clean MOSTLYCLEANFILES = *.raw *.meta *.o -CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # 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., diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index fda8b34..0ba836f 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -230,6 +230,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 88143ff..58a04b9 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -191,6 +191,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/config/examples.am b/config/examples.am index bf0708c..528f43b 100644 --- a/config/examples.am +++ b/config/examples.am @@ -44,12 +44,12 @@ # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. -EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # We need to tell automake what to clean MOSTLYCLEANFILES=*.raw *.meta *.o CHECK_CLEANFILES+=*.h5 -CLEANFILES=$(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +CLEANFILES=$(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # How to create EXAMPLEDIR if it doesn't already exist $(EXAMPLEDIR): @@ -676,6 +676,8 @@ FILTERS MPI_GET_SIZE ADD_PARALLEL_FILES USINGMEMCHECKER +BUILD_EFF_CONDITIONAL_FALSE +BUILD_EFF_CONDITIONAL_TRUE CLEARFILEBUF INSTRUMENT_LIBRARY TRACE_API @@ -784,6 +786,7 @@ HAVE_DMALLOC CODESTACK INSTRUMENT LARGEFILE +EFF GPFS HDF5_HL CXX @@ -919,6 +922,7 @@ enable_metadata_trace_file enable_trace enable_instrument enable_clear_file_buffers +enable_eff enable_using_memchecker enable_parallel with_mpe @@ -1612,6 +1616,7 @@ Optional Features: --enable-clear-file-buffers Securely clear file buffers before writing to file. Default=yes. + --enable-eff Enable EFF stack [default=no] --enable-using-memchecker Enable this option if a memory allocation and/or bounds checking tool will be used on the HDF5 @@ -3995,6 +4000,7 @@ $as_echo "done" >&6; } HDF_CXX=no HDF5_HL=yes GPFS=no + EFF=no LARGEFILE=yes CODESTACK=no @@ -5251,9 +5257,10 @@ if test "X$HDF_FORTRAN" = "Xyes"; then ## -------------------------------------------------------------------- ## General Fortran flags - ## - AM_FCFLAGS="${AM_FCFLAGS} ${FFLAGS}" - FCFLAGS="${FCFLAGS} ${FFLAGS}" + ## Only add FFLAGS to FCFLAGS if it's set. + if test "x$FFLAGS" != "x" ; then + FCFLAGS="${FCFLAGS} ${FFLAGS}" + fi ## -------------------------------------------------------------------- ## Fortran source extention @@ -28767,6 +28774,66 @@ $as_echo "no" >&6; } esac ## ---------------------------------------------------------------------- +## Check if they would like to enable building the IOD plugin +## +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the EFF plugins" >&5 +$as_echo_n "checking whether to enable the EFF plugins... " >&6; } +# Check whether --enable-eff was given. +if test "${enable_eff+set}" = set; then : + enableval=$enable_eff; EFF=yes +else + enableval=no +fi + + + if test "X-$enableval" = "X-yes"; then + BUILD_EFF_CONDITIONAL_TRUE= + BUILD_EFF_CONDITIONAL_FALSE='#' +else + BUILD_EFF_CONDITIONAL_TRUE='#' + BUILD_EFF_CONDITIONAL_FALSE= +fi + + +case "X-$enableval" in + X-yes) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_EFF 1" >>confdefs.h + + ;; + X-no|*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + +esac + +#AC_SUBST([EFF]) +#AC_MSG_CHECKING([whether to build the IOD VOL plugin]) +#AC_ARG_ENABLE([eff], +# [AS_HELP_STRING([--enable-eff], +# [Build the IOD VOL plugin. Default=no.])], +# [EFF=$enableval], +# [EFF=NO]) +#AM_CONDITIONAL([BUILD_EFF_CONDITIONAL], [test -n "$EFF"]) +# +#case "X-$EFF" in +# *) +# EFF=yes +# AC_MSG_RESULT([yes]) +# AC_DEFINE([HAVE_EFF], [1], +# [Define if we have IOD VOL plugin support.]) +# ;; +# X-no) +# EFF=no +# AC_MSG_RESULT([no]) +# ;; +# +#esac + +## ---------------------------------------------------------------------- ## Check if they would like to use a memory checking tool (like valgrind's ## 'memcheck' tool, or Rational Purify, etc) and the library should be ## more scrupulous with it's memory operations. Enabling this also @@ -32222,6 +32289,10 @@ if test -z "${BUILD_SHARED_SZIP_CONDITIONAL_TRUE}" && test -z "${BUILD_SHARED_SZ as_fn_error $? "conditional \"BUILD_SHARED_SZIP_CONDITIONAL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${BUILD_EFF_CONDITIONAL_TRUE}" && test -z "${BUILD_EFF_CONDITIONAL_FALSE}"; then + as_fn_error $? "conditional \"BUILD_EFF_CONDITIONAL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${DIRECT_VFD_CONDITIONAL_TRUE}" && test -z "${DIRECT_VFD_CONDITIONAL_FALSE}"; then as_fn_error $? "conditional \"DIRECT_VFD_CONDITIONAL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 diff --git a/configure.ac b/configure.ac index 257818d..e203342 100644 --- a/configure.ac +++ b/configure.ac @@ -183,6 +183,7 @@ AC_SUBST([HDF_CXX]) HDF_CXX=no AC_SUBST([CXX]) HDF_CXX=no AC_SUBST([HDF5_HL]) HDF5_HL=yes AC_SUBST([GPFS]) GPFS=no +AC_SUBST([EFF]) EFF=no AC_SUBST([LARGEFILE]) LARGEFILE=yes AC_SUBST([INSTRUMENT]) AC_SUBST([CODESTACK]) CODESTACK=no @@ -2839,6 +2840,52 @@ case "X-$CLEARFILEBUF" in esac ## ---------------------------------------------------------------------- +## Check if they would like to enable building the IOD plugin +## +AC_MSG_CHECKING([whether to enable the EFF plugins]) +AC_ARG_ENABLE([eff], + [AS_HELP_STRING([--enable-eff], + [Enable EFF stack [default=no]])],[EFF=yes], + [enableval=no]) + +AM_CONDITIONAL([BUILD_EFF_CONDITIONAL], [test "X-$enableval" = "X-yes"]) + +case "X-$enableval" in + X-yes) + AC_MSG_RESULT([yes]) + AC_DEFINE([HAVE_EFF], [1], + [Define if we have IOD VOL plugin support.]) + ;; + X-no|*) + AC_MSG_RESULT([no]) + ;; + +esac + +#AC_SUBST([EFF]) +#AC_MSG_CHECKING([whether to build the IOD VOL plugin]) +#AC_ARG_ENABLE([eff], +# [AS_HELP_STRING([--enable-eff], +# [Build the IOD VOL plugin. Default=no.])], +# [EFF=$enableval], +# [EFF=NO]) +#AM_CONDITIONAL([BUILD_EFF_CONDITIONAL], [test -n "$EFF"]) +# +#case "X-$EFF" in +# *) +# EFF=yes +# AC_MSG_RESULT([yes]) +# AC_DEFINE([HAVE_EFF], [1], +# [Define if we have IOD VOL plugin support.]) +# ;; +# X-no) +# EFF=no +# AC_MSG_RESULT([no]) +# ;; +# +#esac + +## ---------------------------------------------------------------------- ## Check if they would like to use a memory checking tool (like valgrind's ## 'memcheck' tool, or Rational Purify, etc) and the library should be ## more scrupulous with it's memory operations. Enabling this also diff --git a/examples/Makefile.am b/examples/Makefile.am index 245772f..c22e717 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -23,8 +23,14 @@ include $(top_srcdir)/config/commence.am if BUILD_PARALLEL_CONDITIONAL INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test + LDADD = $(LIBH5TEST) $(LIBHDF5) + EXAMPLE_PROG_PARA = ph5example +endif + +if BUILD_EFF_CONDITIONAL + INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test LDADD = $(LIBH5TEST) $(LIBHDF5) $(MYAXE_LIBS) $(MYIOD_LIBS) $(MYSHIPPER_LIBS) - EXAMPLE_PROG_PARA = ph5example test_server test_client + EXAMPLE_PROG_EFF = test_server test_client endif # Example programs. @@ -61,6 +67,7 @@ $(EXTRA_PROG): $(H5CC) $(H5CC) $(H5CCFLAGS) $(CFLAGS) -o $@ $(srcdir)/$@.c; endif + # Some examples depend on files created by other examples. h5_read.chkexe_: h5_write.chkexe_ h5_chunk_read.chkexe_: h5_extend_write.chkexe_ diff --git a/examples/Makefile.in b/examples/Makefile.in index e86addd..f87d609 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -158,6 +158,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ @@ -386,9 +387,12 @@ TRACE = perl $(top_srcdir)/bin/trace # .chklog files are output from those tests. # *.clog are from the MPE option. CHECK_CLEANFILES = *.chkexe *.chklog *.clog $(EXTLINK_DIRS) *.h5 +@BUILD_EFF_CONDITIONAL_TRUE@INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test @BUILD_PARALLEL_CONDITIONAL_TRUE@INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -@BUILD_PARALLEL_CONDITIONAL_TRUE@LDADD = $(LIBH5TEST) $(LIBHDF5) $(MYAXE_LIBS) $(MYIOD_LIBS) $(MYSHIPPER_LIBS) -@BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = ph5example test_server test_client +@BUILD_EFF_CONDITIONAL_TRUE@LDADD = $(LIBH5TEST) $(LIBHDF5) $(MYAXE_LIBS) $(MYIOD_LIBS) $(MYSHIPPER_LIBS) +@BUILD_PARALLEL_CONDITIONAL_TRUE@LDADD = $(LIBH5TEST) $(LIBHDF5) +@BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = ph5example +@BUILD_EFF_CONDITIONAL_TRUE@EXAMPLE_PROG_EFF = test_server test_client # Example programs. # Don't tell automake about them, because if it knew they were programs, @@ -427,11 +431,11 @@ EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. -EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # We need to tell automake what to clean MOSTLYCLEANFILES = *.raw *.meta *.o -CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # 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., diff --git a/fortran/Makefile.in b/fortran/Makefile.in index c4d9528..861bcb8 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -195,6 +195,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 6bfda48..34700da 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -166,6 +166,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ @@ -426,11 +427,11 @@ EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/fortran # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. -EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # We need to tell automake what to clean MOSTLYCLEANFILES = *.raw *.meta *.o -CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # 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., diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 3c1ec22..33b985c 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -279,6 +279,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 1db2c87..4f3c79d 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -264,6 +264,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 5cfa95b..39effb9 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -190,6 +190,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 84d4dfc..5f338a3 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -195,6 +195,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 720925d..f1535e3 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -191,6 +191,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 4b6d436..4733e52 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -157,6 +157,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ @@ -403,11 +404,11 @@ EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/c++ # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. -EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # We need to tell automake what to clean MOSTLYCLEANFILES = *.raw *.meta *.o -CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # 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., diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 4ae6cf6..56d74dc 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -221,6 +221,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 7ea93f1..c42f211 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -187,6 +187,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index d1ea5c3..4e47ee7 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -157,6 +157,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ @@ -419,11 +420,11 @@ INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. -EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # We need to tell automake what to clean MOSTLYCLEANFILES = *.raw *.meta *.o -CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # 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., diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index a0de1f8..e9a99cc 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -195,6 +195,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 64cf679..1ee01a3 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -158,6 +158,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ @@ -411,11 +412,11 @@ EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl/fortran # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. -EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +EXTRA_PROG = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # We need to tell automake what to clean MOSTLYCLEANFILES = *.raw *.meta *.o -CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) +CLEANFILES = $(EXAMPLE_PROG) $(EXAMPLE_PROG_PARA) $(EXAMPLE_PROG_EFF) # 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., diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index b9e9077..5434638 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -235,6 +235,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 90a7229..b2c1742 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -201,6 +201,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 31b3f29..2269c6a 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -220,6 +220,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index b8edf90..a62be9d 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -228,6 +228,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 354ef75..d3a03af 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -192,6 +192,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 4ece23e..c9c1e08 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -203,6 +203,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/perform/Makefile.in b/perform/Makefile.in index e6f0e9b..dc538a0 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -229,6 +229,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ @@ -39,7 +39,7 @@ #include "H5VLiod.h" /* IOD plugin - tmp */ #include "H5VLiod_client.h" /* Client IOD - tmp */ - +#ifdef H5_HAVE_EFF /****************/ /* Local Macros */ /****************/ @@ -832,3 +832,4 @@ done: FUNC_LEAVE_API(ret_value) } /* end H5AOwait() */ +#endif /* H5_HAVE_EFF */ diff --git a/src/H5FFpublic.h b/src/H5FFpublic.h index ab52616..2936a87 100644 --- a/src/H5FFpublic.h +++ b/src/H5FFpublic.h @@ -23,7 +23,6 @@ /* Public headers needed by this file */ - /*****************/ /* Public Macros */ /*****************/ @@ -32,6 +31,8 @@ extern "C" { #endif +#ifdef H5_HAVE_EFF + /*******************/ /* Public Typedefs */ /*******************/ @@ -51,7 +52,6 @@ typedef enum { /* Public Variables */ /********************/ - /*********************/ /* Public Prototypes */ /*********************/ @@ -83,9 +83,11 @@ H5_DLL herr_t H5Dread_ff(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, H5_DLL herr_t H5AOtest(H5_request_t *req, H5_status_t *status); H5_DLL herr_t H5AOwait(H5_request_t *req, H5_status_t *status); +#endif /* H5_HAVE_EFF */ #ifdef __cplusplus } #endif + #endif /* _H5FFpublic_H */ @@ -2589,6 +2589,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5I_get_id() */ +#ifdef H5_HAVE_EFF /*------------------------------------------------------------------------- * Function: H5I_search_name @@ -2636,7 +2637,8 @@ H5I_search_name(char *name, H5I_type_t type) done: FUNC_LEAVE_NOAPI(ret_value) -} /* end H5I_get_id() */ +} /* end H5I_search_name() */ +#endif /* H5_HAVE_EFF */ /*------------------------------------------------------------------------- diff --git a/src/H5Iprivate.h b/src/H5Iprivate.h index f3edc09..76178c4 100644 --- a/src/H5Iprivate.h +++ b/src/H5Iprivate.h @@ -94,6 +94,11 @@ H5_DLL int H5I_get_type_ref(H5I_type_t type); H5_DLL herr_t H5I_register_aux(hid_t id, void *aux_ptr); H5_DLL void *H5I_get_aux(hid_t id); H5_DLL hid_t H5I_get_id(void *object, H5I_type_t type); + +/* this is just an IOD VOL plugin helper routine */ +#ifdef H5_HAVE_EFF H5_DLL void *H5I_search_name(char *name, H5I_type_t type); +#endif /* H5_HAVE_EFF */ + #endif /* _H5Iprivate_H */ diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index a83df90..ef70b83 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -47,10 +47,12 @@ /* Local Macros */ /****************/ +#ifdef H5_HAVE_EFF #define H5D_XFER_INJECT_BAD_CHECKSUM_SIZE sizeof(hbool_t) #define H5D_XFER_INJECT_BAD_CHECKSUM_DEF FALSE #define H5D_XFER_INJECT_BAD_CHECKSUM_ENC H5P__encode_hbool_t #define H5D_XFER_INJECT_BAD_CHECKSUM_DEC H5P__decode_hbool_t +#endif /* H5_HAVE_EFF */ /* ======== Data transfer properties ======== */ /* Definitions for maximum temp buffer size property */ @@ -242,7 +244,9 @@ const H5P_libclass_t H5P_CLS_DXFR[1] = {{ /* Local Private Variables */ /***************************/ +#ifdef H5_HAVE_EFF static const hbool_t H5D_def_inject_bad_checksum_g = H5D_XFER_INJECT_BAD_CHECKSUM_DEF; +#endif /* H5_HAVE_EFF */ /* Property value defaults */ static const size_t H5D_def_max_temp_buf_g = H5D_XFER_MAX_TEMP_BUF_DEF; /* Default value for maximum temp buffer size */ @@ -296,11 +300,13 @@ H5P__dxfr_reg_prop(H5P_genclass_t *pclass) FUNC_ENTER_STATIC +#ifdef H5_HAVE_EFF if(H5P_register_real(pclass, H5D_XFER_INJECT_BAD_CHECKSUM_NAME, H5D_XFER_INJECT_BAD_CHECKSUM_SIZE, &H5D_def_inject_bad_checksum_g, NULL, NULL, NULL, H5D_XFER_INJECT_BAD_CHECKSUM_ENC, H5D_XFER_INJECT_BAD_CHECKSUM_DEC, NULL, NULL, NULL, NULL) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINSERT, FAIL, "can't insert property into class") +#endif /* H5_HAVE_EFF */ /* Register the max. temp buffer size property */ if(H5P_register_real(pclass, H5D_XFER_MAX_TEMP_BUF_NAME, H5D_XFER_MAX_TEMP_BUF_SIZE, &H5D_def_max_temp_buf_g, diff --git a/src/H5VLiod.c b/src/H5VLiod.c index d939d08..4a597af 100644 --- a/src/H5VLiod.c +++ b/src/H5VLiod.c @@ -35,6 +35,8 @@ #include "H5VLiod.h" /* Iod VOL plugin */ #include "H5VLiod_client.h" /* Client IOD helper */ +#ifdef H5_HAVE_EFF + /* function shipper IDs for different routines */ static fs_id_t H5VL_EFF_INIT_ID; static fs_id_t H5VL_EFF_FINALIZE_ID; @@ -2421,3 +2423,5 @@ H5VL_iod_dataset_close(void *_dset, hid_t UNUSED req) done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5VL_iod_dataset_close() */ + +#endif /* H5_HAVE_EFF */ diff --git a/src/H5VLiod.h b/src/H5VLiod.h index 56c48b3..f924a0c 100644 --- a/src/H5VLiod.h +++ b/src/H5VLiod.h @@ -29,7 +29,7 @@ #include "function_shipper_handler.h" #include "network_mpi.h" -#ifdef H5_HAVE_PARALLEL +#ifdef H5_HAVE_EFF #define H5VL_IOD (H5VL_iod_init()) #else #define H5VL_IOD (-1) @@ -39,7 +39,7 @@ extern "C" { #endif -#ifdef H5_HAVE_PARALLEL +#ifdef H5_HAVE_EFF #define H5D_XFER_INJECT_BAD_CHECKSUM_NAME "inject_bad_checksum" @@ -50,7 +50,7 @@ H5_DLL herr_t EFF_init(MPI_Comm comm, MPI_Info info); H5_DLL herr_t EFF_finalize(void); H5_DLL herr_t H5Pset_dxpl_inject_bad_checksum(hid_t dxpl_id, hbool_t flag); H5_DLL herr_t H5Pget_dxpl_inject_bad_checksum(hid_t dxpl_id, hbool_t *flag); -#endif /* H5_HAVE_PARALLEL */ +#endif /* H5_HAVE_EFF */ #ifdef __cplusplus } diff --git a/src/H5VLiod_client.c b/src/H5VLiod_client.c index ba08762..34f4000 100644 --- a/src/H5VLiod_client.c +++ b/src/H5VLiod_client.c @@ -32,6 +32,8 @@ #include "H5VLiod_client.h" #include "H5WBprivate.h" /* Wrapped Buffers */ +#ifdef H5_HAVE_EFF + herr_t H5VL_iod_request_add(H5VL_iod_file_t *file, H5VL_iod_request_t *request) { @@ -484,3 +486,5 @@ done: HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't release wrapped buffer") FUNC_LEAVE_NOAPI(ret_value) } /* end H5VL_iod_local_traverse */ + +#endif /* H5_HAVE_EFF */ diff --git a/src/H5VLiod_client.h b/src/H5VLiod_client.h index c20e8e6..a2f19fe 100644 --- a/src/H5VLiod_client.h +++ b/src/H5VLiod_client.h @@ -23,6 +23,8 @@ #include "H5VLiod.h" /* Iod VOL plugin */ #include "H5VLiod_common.h" +#ifdef H5_HAVE_EFF + /* forward declaration of file struct */ struct H5VL_iod_file_t; struct H5VL_iod_object_t; @@ -139,5 +141,5 @@ H5_DLL herr_t H5VL_iod_client_decode_dset_set_extent(fs_proc_t proc, void *_outp H5_DLL herr_t H5VL_iod_client_encode_dset_close(fs_proc_t proc, void *_input); H5_DLL herr_t H5VL_iod_client_decode_dset_close(fs_proc_t proc, void *_output); - +#endif /* H5_HAVE_EFF */ #endif /* _H5VLiod_client_H */ diff --git a/src/H5VLiod_client_encdec.c b/src/H5VLiod_client_encdec.c index 9272cae..fdb92e6 100644 --- a/src/H5VLiod_client_encdec.c +++ b/src/H5VLiod_client_encdec.c @@ -28,6 +28,8 @@ #include "H5VLiod_common.h" #include "H5VLiod_client.h" +#ifdef H5_HAVE_EFF + /*------------------------------------------------------------------------- * Function: H5VL_client_encode_eff_init *------------------------------------------------------------------------- */ @@ -1267,3 +1269,5 @@ H5VL_iod_client_decode_dset_close(fs_proc_t proc, void *_output) done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5VL_client_decode_dset_close() */ + +#endif /* H5_HAVE_EFF */ diff --git a/src/H5VLiod_common.h b/src/H5VLiod_common.h index 4c1c146..43ab208 100644 --- a/src/H5VLiod_common.h +++ b/src/H5VLiod_common.h @@ -22,6 +22,8 @@ #include "H5VLpublic.h" #include "H5VLiod.h" /* Iod VOL plugin */ +#ifdef H5_HAVE_EFF + #define NA_UNDEFINED NULL /* struct that contains the information about the IOD container */ @@ -281,4 +283,5 @@ static inline int fs_proc_remote_object_t(fs_proc_t proc, void *data) } #endif +#endif /* H5_HAVE_EFF */ #endif /* _H5VLiod_common_H */ diff --git a/src/H5VLiod_server.c b/src/H5VLiod_server.c index 042264e..85e1016 100644 --- a/src/H5VLiod_server.c +++ b/src/H5VLiod_server.c @@ -30,6 +30,8 @@ #include "H5VLiod_server.h" #include "H5WBprivate.h" /* Wrapped Buffers */ +#ifdef H5_HAVE_EFF + /* * Programmer: Mohamad Chaarawi <chaarawi@hdfgroup.gov> * February, 2012 @@ -2147,3 +2149,5 @@ done: input = H5MM_xfree(input); FUNC_LEAVE_NOAPI(ret_value) } /* end H5VL_iod_server_dset_close_cb() */ + +#endif /* H5_HAVE_EFF */ diff --git a/src/H5VLiod_server.h b/src/H5VLiod_server.h index db5b172..7b2256b 100644 --- a/src/H5VLiod_server.h +++ b/src/H5VLiod_server.h @@ -22,6 +22,8 @@ #include "H5VLiod.h" /* Iod VOL plugin */ #include "H5VLiod_common.h" +#ifdef H5_HAVE_EFF + /* struct that contains the information about the IOD container */ typedef struct H5VL_iod_server_remote_file_t { iod_handle_t coh; @@ -101,4 +103,5 @@ H5_DLL herr_t H5VL_iod_server_decode_dset_set_extent(fs_proc_t proc, void *_inpu H5_DLL herr_t H5VL_iod_server_encode_dset_close(fs_proc_t proc, void *_input); H5_DLL herr_t H5VL_iod_server_decode_dset_close(fs_proc_t proc, void *_input); +#endif /* H5_HAVE_EFF */ #endif /* _H5VLiod_server_H */ diff --git a/src/H5VLiod_server_encdec.c b/src/H5VLiod_server_encdec.c index 965b49a..2c03554 100644 --- a/src/H5VLiod_server_encdec.c +++ b/src/H5VLiod_server_encdec.c @@ -25,6 +25,8 @@ #include "H5VLiod_common.h" #include "H5VLiod_server.h" +#ifdef H5_HAVE_EFF + /* * Programmer: Mohamad Chaarawi <chaarawi@hdfgroup.gov> * February, 2012 @@ -1168,3 +1170,5 @@ H5VL_iod_server_encode_dset_close(fs_proc_t proc, void *_output) done: FUNC_LEAVE_NOAPI(SUCCEED) } /* end H5VL_iod_server_encode_dset_close() */ + +#endif /* H5_HAVE_EFF */ diff --git a/src/H5config.h.in b/src/H5config.h.in index d9016dc..d86c6fb 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -20,9 +20,6 @@ /* Define the default virtual file driver to compile */ #undef DEFAULT_VFD -/* Define the default vol plugin to compile */ -#undef DEFAULT_VOL - /* Define if `dev_t' is a scalar */ #undef DEV_T_IS_SCALAR @@ -61,6 +58,9 @@ /* Define if the __attribute__(()) extension is present */ #undef HAVE_ATTRIBUTE +/* Define to 1 if you have the <AXE.h> header file. */ +#undef HAVE_AXE_H + /* Define to 1 if you have the `BSDgettimeofday' function. */ #undef HAVE_BSDGETTIMEOFDAY @@ -96,6 +96,9 @@ /* Define to 1 if you have the <dmalloc.h> header file. */ #undef HAVE_DMALLOC_H +/* Define if we have IOD VOL plugin support. */ +#undef HAVE_EFF + /* Define if library information should be embedded in the executables */ #undef HAVE_EMBEDDED_LIBINFO @@ -150,6 +153,12 @@ /* Define if the compiler understands the __FUNCTION__ keyword */ #undef HAVE_FUNCTION +/* Define to 1 if you have the <function_shipper.h> header file. */ +#undef HAVE_FUNCTION_SHIPPER_H + +/* Define to 1 if you have the <function_shipper_handler.h> header file. */ +#undef HAVE_FUNCTION_SHIPPER_HANDLER_H + /* Define to 1 if you have the `GetConsoleScreenBufferInfo' function. */ #undef HAVE_GETCONSOLESCREENBUFFERINFO @@ -187,12 +196,33 @@ /* Define to 1 if you have the `ioctl' function. */ #undef HAVE_IOCTL +/* Define to 1 if you have the <iod_api.h> header file. */ +#undef HAVE_IOD_API_H + /* Define to 1 if you have the <io.h> header file. */ #undef HAVE_IO_H +/* Define to 1 if you have the `axe' library (-laxe). */ +#undef HAVE_LIBAXE + /* Define to 1 if you have the `dmalloc' library (-ldmalloc). */ #undef HAVE_LIBDMALLOC +/* Define to 1 if you have the `iod' library (-liod). */ +#undef HAVE_LIBIOD + +/* Define to 1 if you have the `iofsl_shipper_bds' library + (-liofsl_shipper_bds). */ +#undef HAVE_LIBIOFSL_SHIPPER_BDS + +/* Define to 1 if you have the `iofsl_shipper_fs' library + (-liofsl_shipper_fs). */ +#undef HAVE_LIBIOFSL_SHIPPER_FS + +/* Define to 1 if you have the `iofsl_shipper_na' library + (-liofsl_shipper_na). */ +#undef HAVE_LIBIOFSL_SHIPPER_NA + /* Define to 1 if you have the `lmpe' library (-llmpe). */ #undef HAVE_LIBLMPE @@ -259,6 +289,9 @@ /* Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists */ #undef HAVE_MPI_MULTI_LANG_Info +/* Define to 1 if you have the <network_abstraction.h> header file. */ +#undef HAVE_NETWORK_ABSTRACTION_H + /* Define if we have parallel support */ #undef HAVE_PARALLEL diff --git a/src/Makefile.in b/src/Makefile.in index 065b24e..bfcf289 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -288,6 +288,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index 343fa34..7feb5b6 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -57,6 +57,7 @@ Languages: Features: --------- Parallel HDF5: @PARALLEL@ + Exascale Fast Forward Stack: @EFF@ High Level library: @HDF5_HL@ Threadsafety: @THREADSAFE@ Default API Mapping: @DEFAULT_API_VERSION@ diff --git a/test/Makefile.in b/test/Makefile.in index 119b6f3..d278cb8 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -554,6 +554,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 19d4286..5645a43 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -216,6 +216,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/Makefile.in b/tools/Makefile.in index a53f7b9..1d8e4b9 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -192,6 +192,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index df19e3d..5ea8f04 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -195,6 +195,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index ab50d71..cc79a15 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -202,6 +202,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 2a307c6..618ccb6 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -197,6 +197,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 4eb7ee2..1db14bc 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -195,6 +195,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index abc3446..1eddcc1 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -209,6 +209,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 017ab0d..dbce58c 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -189,6 +189,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 66f0f28..475e64f 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -209,6 +209,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 9bd48c9..814b3cb 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -224,6 +224,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index dbdfdf0..8214ddb 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -187,6 +187,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 9324626..b40ddd8 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -249,6 +249,7 @@ DYNAMIC_DIRS = @DYNAMIC_DIRS@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ +EFF = @EFF@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXTERNAL_FILTERS = @EXTERNAL_FILTERS@ |