summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
Diffstat (limited to 'c++')
-rw-r--r--c++/Makefile.in21
-rw-r--r--c++/examples/Makefile.in21
-rw-r--r--c++/src/Makefile.in21
-rw-r--r--c++/test/Makefile.in21
4 files changed, 60 insertions, 24 deletions
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 ""; \
generated by cgit v0.12 at 2024-11-07 12:48:07 (GMT)