From 59ec5b3d661c87b69b00cadf67287184f8544dbd Mon Sep 17 00:00:00 2001 From: James Laird Date: Thu, 31 Mar 2005 13:26:17 -0500 Subject: [svn-r10517] Purpose: Bug fix Description: On some machines, $RUNSERIAL variable needs to be used to run tests. Set $RUNTESTS (which is used for non-parallel tests) to be $RUNSERIAL in configure.am. Also, since I was updating all Makefiles.in anyway, I updated commence.am to point to autotools installs in AFS instead of those on heping. Platforms tested: mir, sleipnir, modi4, copper --- Makefile.in | 19 ++++++++++++++----- c++/Makefile.in | 21 +++++++++++++++------ c++/examples/Makefile.in | 21 +++++++++++++++------ c++/src/Makefile.in | 21 +++++++++++++++------ c++/test/Makefile.in | 21 +++++++++++++++------ config/commence.am | 20 +++++++++++++++----- config/conclude.am | 2 +- doc/Makefile.in | 19 ++++++++++++++----- doc/html/ADGuide/Makefile.in | 19 ++++++++++++++----- doc/html/Graphics/Makefile.in | 19 ++++++++++++++----- doc/html/Intro/Makefile.in | 19 ++++++++++++++----- doc/html/Makefile.in | 19 ++++++++++++++----- doc/html/PSandPDF/Makefile.in | 19 ++++++++++++++----- doc/html/TechNotes/Makefile.in | 19 ++++++++++++++----- doc/html/Tutor/Graphics/Makefile.in | 19 ++++++++++++++----- doc/html/Tutor/Makefile.in | 19 ++++++++++++++----- doc/html/Tutor/examples/Makefile.in | 19 ++++++++++++++----- doc/html/cpplus/Makefile.in | 19 ++++++++++++++----- doc/html/ed_libs/Makefile.in | 19 ++++++++++++++----- doc/html/ed_styles/Makefile.in | 19 ++++++++++++++----- doc/html/fortran/Makefile.in | 19 ++++++++++++++----- examples/Makefile.in | 21 +++++++++++++++------ fortran/Makefile.in | 21 +++++++++++++++------ fortran/examples/Makefile.in | 21 +++++++++++++++------ fortran/src/Makefile.in | 21 +++++++++++++++------ fortran/test/Makefile.in | 21 +++++++++++++++------ fortran/testpar/Makefile.in | 21 +++++++++++++++------ hl/Makefile.in | 21 +++++++++++++++------ hl/c++/Makefile.in | 21 +++++++++++++++------ hl/c++/src/Makefile.in | 21 +++++++++++++++------ hl/c++/test/Makefile.in | 21 +++++++++++++++------ hl/fortran/Makefile.in | 21 +++++++++++++++------ hl/fortran/src/Makefile.in | 21 +++++++++++++++------ hl/fortran/test/Makefile.in | 21 +++++++++++++++------ hl/src/Makefile.in | 21 +++++++++++++++------ hl/test/Makefile.in | 21 +++++++++++++++------ hl/tools/gif2h5/Makefile.in | 21 +++++++++++++++------ perform/Makefile.in | 21 +++++++++++++++------ src/Makefile.in | 21 +++++++++++++++------ test/Makefile.in | 21 +++++++++++++++------ testpar/Makefile.in | 21 +++++++++++++++------ tools/Makefile.in | 21 +++++++++++++++------ tools/gifconv/Makefile.in | 21 +++++++++++++++------ tools/h5diff/Makefile.in | 21 +++++++++++++++------ tools/h5dump/Makefile.in | 21 +++++++++++++++------ tools/h5import/Makefile.in | 21 +++++++++++++++------ tools/h5jam/Makefile.in | 21 +++++++++++++++------ tools/h5ls/Makefile.in | 21 +++++++++++++++------ tools/h5repack/Makefile.in | 21 +++++++++++++++------ tools/lib/Makefile.in | 21 +++++++++++++++------ tools/misc/Makefile.in | 21 +++++++++++++++------ 51 files changed, 736 insertions(+), 285 deletions(-) diff --git a/Makefile.in b/Makefile.in index ff93227..65fb841 100644 --- a/Makefile.in +++ b/Makefile.in @@ -104,18 +104,18 @@ GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -286,6 +286,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/c++/Makefile.in b/c++/Makefile.in index b1f8787..76a81f0 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -74,18 +74,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -256,6 +256,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -672,7 +681,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index dac1b3c..1e62927 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -66,18 +66,18 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -248,6 +248,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -562,7 +571,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index e2f262f..06cb909 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -108,18 +108,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -290,6 +290,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -747,7 +756,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 5e18fa0..145924a 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -97,18 +97,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -279,6 +279,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -635,7 +644,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/config/commence.am b/config/commence.am index 4e936e1..23c26ad 100644 --- a/config/commence.am +++ b/config/commence.am @@ -12,6 +12,15 @@ CP=cp # configure's automatic SHELL detection may not work on the build machine. SHELL=/bin/sh +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS=$(RUNSERIAL) + # Libraries to link to while building LIBHDF5=$(top_builddir)/src/libhdf5.la LIBH5TEST=$(top_builddir)/test/libh5test.la @@ -37,9 +46,10 @@ H5FC_PP=$(bindir)/h5pfc F9XMODEXT=@F9XMODEXT@ F9XMODFLAG=@F9XMODFLAG@ -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL=/usr/bin/aclocal -AUTOCONF=/usr/local/autoconf-2.59/bin/autoconf -AUTOMAKE=/usr/bin/automake -AUTOHEADER=/usr/local/autoconf-2.59/bin/autoheader +ACLOCAL=/afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal +AUTOHEADER=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE=/afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake +AUTOCONF=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf + diff --git a/config/conclude.am b/config/conclude.am index 19b61f5..6354196 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -64,7 +64,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/doc/Makefile.in b/doc/Makefile.in index b51a5e4..e44dc5b 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -71,18 +71,18 @@ CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -253,6 +253,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/ADGuide/Makefile.in b/doc/html/ADGuide/Makefile.in index e3edc95..e5e420b 100644 --- a/doc/html/ADGuide/Makefile.in +++ b/doc/html/ADGuide/Makefile.in @@ -68,18 +68,18 @@ localdocDATA_INSTALL = $(INSTALL_DATA) DATA = $(localdoc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -250,6 +250,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/Graphics/Makefile.in b/doc/html/Graphics/Makefile.in index 3a548d2..517ad92 100644 --- a/doc/html/Graphics/Makefile.in +++ b/doc/html/Graphics/Makefile.in @@ -68,18 +68,18 @@ localdocDATA_INSTALL = $(INSTALL_DATA) DATA = $(localdoc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -250,6 +250,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/Intro/Makefile.in b/doc/html/Intro/Makefile.in index af08d52..443f684 100644 --- a/doc/html/Intro/Makefile.in +++ b/doc/html/Intro/Makefile.in @@ -68,18 +68,18 @@ localdocDATA_INSTALL = $(INSTALL_DATA) DATA = $(localdoc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -250,6 +250,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in index cf8cde3..0fcba17 100644 --- a/doc/html/Makefile.in +++ b/doc/html/Makefile.in @@ -81,18 +81,18 @@ CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -263,6 +263,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/PSandPDF/Makefile.in b/doc/html/PSandPDF/Makefile.in index a6d735b..7598150 100644 --- a/doc/html/PSandPDF/Makefile.in +++ b/doc/html/PSandPDF/Makefile.in @@ -58,18 +58,18 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -240,6 +240,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/TechNotes/Makefile.in b/doc/html/TechNotes/Makefile.in index c0f8d70..d2e39aa 100644 --- a/doc/html/TechNotes/Makefile.in +++ b/doc/html/TechNotes/Makefile.in @@ -68,18 +68,18 @@ localdocDATA_INSTALL = $(INSTALL_DATA) DATA = $(localdoc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -250,6 +250,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/Tutor/Graphics/Makefile.in b/doc/html/Tutor/Graphics/Makefile.in index 5924da9..175a306 100644 --- a/doc/html/Tutor/Graphics/Makefile.in +++ b/doc/html/Tutor/Graphics/Makefile.in @@ -68,18 +68,18 @@ localdocDATA_INSTALL = $(INSTALL_DATA) DATA = $(localdoc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -250,6 +250,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/Tutor/Makefile.in b/doc/html/Tutor/Makefile.in index 01aea64..4651d98 100644 --- a/doc/html/Tutor/Makefile.in +++ b/doc/html/Tutor/Makefile.in @@ -77,18 +77,18 @@ CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -259,6 +259,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/Tutor/examples/Makefile.in b/doc/html/Tutor/examples/Makefile.in index 10c862e..0bac380 100644 --- a/doc/html/Tutor/examples/Makefile.in +++ b/doc/html/Tutor/examples/Makefile.in @@ -70,18 +70,18 @@ nobase_localdocDATA_INSTALL = $(install_sh_DATA) DATA = $(localdoc_DATA) $(nobase_localdoc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -252,6 +252,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/cpplus/Makefile.in b/doc/html/cpplus/Makefile.in index ed2276b..1c2ca46 100644 --- a/doc/html/cpplus/Makefile.in +++ b/doc/html/cpplus/Makefile.in @@ -68,18 +68,18 @@ localdocDATA_INSTALL = $(INSTALL_DATA) DATA = $(localdoc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -250,6 +250,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/ed_libs/Makefile.in b/doc/html/ed_libs/Makefile.in index 6753a2b..afaf977 100644 --- a/doc/html/ed_libs/Makefile.in +++ b/doc/html/ed_libs/Makefile.in @@ -68,18 +68,18 @@ localdocDATA_INSTALL = $(INSTALL_DATA) DATA = $(localdoc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -250,6 +250,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/ed_styles/Makefile.in b/doc/html/ed_styles/Makefile.in index 866e55b..3f05041 100644 --- a/doc/html/ed_styles/Makefile.in +++ b/doc/html/ed_styles/Makefile.in @@ -68,18 +68,18 @@ localdocDATA_INSTALL = $(INSTALL_DATA) DATA = $(localdoc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -250,6 +250,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/doc/html/fortran/Makefile.in b/doc/html/fortran/Makefile.in index 48364ab..31b93d9 100644 --- a/doc/html/fortran/Makefile.in +++ b/doc/html/fortran/Makefile.in @@ -68,18 +68,18 @@ localdocDATA_INSTALL = $(INSTALL_DATA) DATA = $(localdoc_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -250,6 +250,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la diff --git a/examples/Makefile.in b/examples/Makefile.in index 61c8a4a..e42a854 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -66,18 +66,18 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -248,6 +248,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -578,7 +587,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 0579fc4..1824417 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -78,18 +78,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -260,6 +260,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -680,7 +689,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index c3e0e53..cae5546 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -66,18 +66,18 @@ SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -248,6 +248,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -574,7 +583,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index c863fc6..0099564 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -118,18 +118,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -300,6 +300,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -800,7 +809,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index ffe1359..980cfc4 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -135,18 +135,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -317,6 +317,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -841,7 +850,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 54a9f39..4f26423 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -90,18 +90,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -272,6 +272,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -640,7 +649,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/hl/Makefile.in b/hl/Makefile.in index 94c652d..544a263 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -70,18 +70,18 @@ CTAGS = ctags DIST_SUBDIRS = src test c++ fortran DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -252,6 +252,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -646,7 +655,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index ce8b45d..feb99b9 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -75,18 +75,18 @@ CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -257,6 +257,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -649,7 +658,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 994e21a..0093ce5 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -97,18 +97,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -279,6 +279,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -671,7 +680,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index f1a0959..19f1773 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -91,18 +91,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -273,6 +273,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -620,7 +629,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 4c0e772..9592f6d 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -70,18 +70,18 @@ CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -252,6 +252,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -644,7 +653,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index b8dd328..6ee4e0e 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -92,18 +92,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -274,6 +274,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -690,7 +699,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 198277e..70533f5 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -90,18 +90,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -272,6 +272,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -613,7 +622,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 939de36..899162f 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -88,18 +88,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -270,6 +270,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -659,7 +668,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 8bfad44..7380d0f 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -100,18 +100,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -282,6 +282,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -647,7 +656,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index c4a87e1..71c944c 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -98,18 +98,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -280,6 +280,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -654,7 +663,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/perform/Makefile.in b/perform/Makefile.in index cfd939a..bd0ed5c 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -114,18 +114,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -296,6 +296,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -676,7 +685,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/src/Makefile.in b/src/Makefile.in index 1e34aba..9fc9c31 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -163,18 +163,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -345,6 +345,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -983,7 +992,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/test/Makefile.in b/test/Makefile.in index 6a6a985..4546de8 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -292,18 +292,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -474,6 +474,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -1082,7 +1091,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 3e54a86..0a3614f 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -99,18 +99,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -281,6 +281,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -652,7 +661,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/tools/Makefile.in b/tools/Makefile.in index a18751d..1f68bb9 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -75,18 +75,18 @@ CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -257,6 +257,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -651,7 +660,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index c4a87e1..71c944c 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -98,18 +98,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -280,6 +280,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -654,7 +663,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 8147961..0019b27 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -106,18 +106,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -288,6 +288,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -696,7 +705,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index c302db7..d387436 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -99,18 +99,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -281,6 +281,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -670,7 +679,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 497bd11..8ebb489 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -99,18 +99,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -281,6 +281,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -661,7 +670,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 0b234cd..1a8000a 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -94,18 +94,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -276,6 +276,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -687,7 +696,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 1ce0784..1358f82 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -92,18 +92,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -274,6 +274,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -641,7 +650,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 53ce416..44f9cbf 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -114,18 +114,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -296,6 +296,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -720,7 +729,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 9557701..bd6239f 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -96,18 +96,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -278,6 +278,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -658,7 +667,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 23016ab..4ea6bd1 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -104,18 +104,18 @@ ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -# Set the paths for autotools to be correct on heping. +# Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. -ACLOCAL = /usr/bin/aclocal +ACLOCAL = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ -AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf -AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader -AUTOMAKE = /usr/bin/automake +AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf +AUTOHEADER = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader +AUTOMAKE = /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AWK = @AWK@ BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@ BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@ @@ -286,6 +286,15 @@ target_alias = @target_alias@ RM = rm -f CP = cp +# Some machines need a command to run executables; this is that command +# so that our tests will run. +# We use RUNTESTS instead of RUNSERIAL directly because it may be that +# some tests need to be run with a different command. Older versions +# of the makefiles used the command +# $(LIBTOOL) --mode=execute +# in some directories, for instance. +RUNTESTS = $(RUNSERIAL) + # Libraries to link to while building LIBHDF5 = $(top_builddir)/src/libhdf5.la LIBH5TEST = $(top_builddir)/test/libh5test.la @@ -706,7 +715,7 @@ test _test: $(PROGS) $(TESTS) fi; \ echo "============================"; \ srcdir="$(srcdir)" \ - $(RUNTEST) ./$$test $(TEST_FLAGS) || \ + $(RUNTESTS) ./$$test $(TEST_FLAGS) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ break; \ echo ""; \ -- cgit v0.12