summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.in3
-rw-r--r--tools/h5diff/Makefile.am2
-rw-r--r--tools/h5diff/Makefile.in9
-rw-r--r--tools/h5dump/Makefile.am2
-rw-r--r--tools/h5dump/Makefile.in9
-rw-r--r--tools/h5import/Makefile.am2
-rwxr-xr-xtools/h5import/Makefile.in9
-rw-r--r--tools/h5jam/Makefile.am2
-rw-r--r--tools/h5jam/Makefile.in9
-rw-r--r--tools/h5ls/Makefile.am2
-rw-r--r--tools/h5ls/Makefile.in9
-rw-r--r--tools/h5repack/Makefile.am2
-rw-r--r--tools/h5repack/Makefile.in9
-rw-r--r--tools/lib/Makefile.am2
-rw-r--r--tools/lib/Makefile.in8
-rw-r--r--tools/misc/Makefile.am2
-rw-r--r--tools/misc/Makefile.in8
17 files changed, 57 insertions, 32 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 4649e79..7e6b5c2 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -268,6 +268,9 @@ RM = rm -f
CP = cp
TIME = time
+# Path for hl needed in hdf5.h
+INCLUDES = -I$(top_srcdir)/hl/src
+
# 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
diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am
index 2d5ed69..aa08864 100644
--- a/tools/h5diff/Makefile.am
+++ b/tools/h5diff/Makefile.am
@@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
-INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
+INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Always build and test h5diff but build and test ph5diff only if parallel
# is enabled.
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index 4566cf6..c8cf161 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -299,6 +299,12 @@ RM = rm -f
CP = cp
TIME = time
+# Path for hl needed in hdf5.h
+
+# Include src and tools/lib directories
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \
+ -I$(top_srcdir)/tools/lib
+
# 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
@@ -347,9 +353,6 @@ TRACE = perl $(top_srcdir)/bin/trace
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 expect_sorted \
actual_sorted
-# Include src and tools/lib directories
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
-
# Always build and test h5diff but build and test ph5diff only if parallel
# is enabled.
@BUILD_PARALLEL_CONDITIONAL_TRUE@H5PDIFF = ph5diff
diff --git a/tools/h5dump/Makefile.am b/tools/h5dump/Makefile.am
index 85b1443..ab4f73d 100644
--- a/tools/h5dump/Makefile.am
+++ b/tools/h5dump/Makefile.am
@@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include files in /src directory and /tools/lib directory
-INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
+INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_PROG=h5dumpgentest
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 2058e99..133bcca 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -292,6 +292,12 @@ RM = rm -f
CP = cp
TIME = time
+# Path for hl needed in hdf5.h
+
+# Include files in /src directory and /tools/lib directory
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \
+ -I$(top_srcdir)/tools/lib
+
# 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
@@ -339,9 +345,6 @@ TRACE = perl $(top_srcdir)/bin/trace
# copied to the testfiles/ directory if update is required.
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
-# Include files in /src directory and /tools/lib directory
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
-
# Test programs and scripts
TEST_PROG = h5dumpgentest
TEST_SCRIPT = testh5dump.sh $(srcdir)/testh5dumpxml.sh
diff --git a/tools/h5import/Makefile.am b/tools/h5import/Makefile.am
index 7144b5e..355f34c 100644
--- a/tools/h5import/Makefile.am
+++ b/tools/h5import/Makefile.am
@@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
-INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
+INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_PROG=h5importtest
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index c6cb439..678d170 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -292,6 +292,12 @@ RM = rm -f
CP = cp
TIME = time
+# Path for hl needed in hdf5.h
+
+# Include src and tools/lib directories
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \
+ -I$(top_srcdir)/tools/lib
+
# 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
@@ -336,9 +342,6 @@ TRACE = perl $(top_srcdir)/bin/trace
# *.clog are from the MPE option.
CHECK_CLEANFILES = *.chkexe *.chklog *.clog
-# Include src and tools/lib directories
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
-
# Test programs and scripts
TEST_PROG = h5importtest
TEST_SCRIPT = $(srcdir)/h5importtestutil.sh
diff --git a/tools/h5jam/Makefile.am b/tools/h5jam/Makefile.am
index 3824965..313a816 100644
--- a/tools/h5jam/Makefile.am
+++ b/tools/h5jam/Makefile.am
@@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
-INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
+INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
bin_PROGRAMS=h5jam h5unjam
check_PROGRAMS=tellub h5jamgentest getub
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 79e116d..27104f3 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -303,6 +303,12 @@ RM = rm -f
CP = cp
TIME = time
+# Path for hl needed in hdf5.h
+
+# Include src and tools/lib directories
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \
+ -I$(top_srcdir)/tools/lib
+
# 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
@@ -349,9 +355,6 @@ TRACE = perl $(top_srcdir)/bin/trace
# Temporary files. *.h5 are generated by jamgentest. They should
# copied to the testfiles/ directory if update is required.
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.txt
-
-# Include src and tools/lib directories
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
TEST_SCRIPT = testh5jam.sh
check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5jam$(EXEEXT) h5unjam$(EXEEXT)
diff --git a/tools/h5ls/Makefile.am b/tools/h5ls/Makefile.am
index 7d3e1e7..553652e 100644
--- a/tools/h5ls/Makefile.am
+++ b/tools/h5ls/Makefile.am
@@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src and tools/lib directories
-INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
+INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_SCRIPT=$(srcdir)/testh5ls.sh
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 13fe9e3..ef78bc6 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -285,6 +285,12 @@ RM = rm -f
CP = cp
TIME = time
+# Path for hl needed in hdf5.h
+
+# Include src and tools/lib directories
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \
+ -I$(top_srcdir)/tools/lib
+
# 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
@@ -329,9 +335,6 @@ TRACE = perl $(top_srcdir)/bin/trace
# *.clog are from the MPE option.
CHECK_CLEANFILES = *.chkexe *.chklog *.clog
-# Include src and tools/lib directories
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
-
# Test programs and scripts
TEST_SCRIPT = $(srcdir)/testh5ls.sh
check_SCRIPTS = $(TEST_SCRIPT)
diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am
index 794dd43..97b16ee 100644
--- a/tools/h5repack/Makefile.am
+++ b/tools/h5repack/Makefile.am
@@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src, test, and tools/lib directories
-INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
+INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
# Test programs and scripts
TEST_SCRIPT=h5repack.sh
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index 5394cca..d833475 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -307,6 +307,12 @@ RM = rm -f
CP = cp
TIME = time
+# Path for hl needed in hdf5.h
+
+# Include src, test, and tools/lib directories
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \
+ -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
+
# 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
@@ -354,9 +360,6 @@ TRACE = perl $(top_srcdir)/bin/trace
# copied to the testfiles/ directory if update is required.
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
-# Include src, test, and tools/lib directories
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
-
# Test programs and scripts
TEST_SCRIPT = h5repack.sh
TEST_PROG = h5repacktst
diff --git a/tools/lib/Makefile.am b/tools/lib/Makefile.am
index dad3db3..4527820 100644
--- a/tools/lib/Makefile.am
+++ b/tools/lib/Makefile.am
@@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include files in /src directory
-INCLUDES=-I$(top_srcdir)/src
+INCLUDES+=-I$(top_srcdir)/src
# This is our main target, the h5tools library.
noinst_LTLIBRARIES=libh5tools.la
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 1ecc413..be4892d 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -289,6 +289,11 @@ RM = rm -f
CP = cp
TIME = time
+# Path for hl needed in hdf5.h
+
+# Include files in /src directory
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src
+
# 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
@@ -333,9 +338,6 @@ TRACE = perl $(top_srcdir)/bin/trace
# *.clog are from the MPE option.
CHECK_CLEANFILES = *.chkexe *.chklog *.clog
-# Include files in /src directory
-INCLUDES = -I$(top_srcdir)/src
-
# This is our main target, the h5tools library.
noinst_LTLIBRARIES = libh5tools.la
libh5tools_la_SOURCES = h5tools.c h5tools_str.c h5tools_utils.c h5diff.c \
diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am
index 32ede77..d178984 100644
--- a/tools/misc/Makefile.am
+++ b/tools/misc/Makefile.am
@@ -20,7 +20,7 @@
include $(top_srcdir)/config/commence.am
# Include src directory
-INCLUDES=-I$(top_srcdir)/src
+INCLUDES+=-I$(top_srcdir)/src
#test script and program
TEST_PROG=h5repart_gentest
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 6a9a81c..f498a83 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -310,6 +310,11 @@ RM = rm -f
CP = cp
TIME = time
+# Path for hl needed in hdf5.h
+
+# Include src directory
+INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src
+
# 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
@@ -359,9 +364,6 @@ TRACE = perl $(top_srcdir)/bin/trace
CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 \
../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
-# Include src directory
-INCLUDES = -I$(top_srcdir)/src
-
#test script and program
TEST_PROG = h5repart_gentest
TEST_SCRIPT = testh5repart.sh
generated by cgit v0.12 at 2024-11-21 16:14:28 (GMT)