summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/commence.in2
-rw-r--r--examples/Makefile.in34
-rw-r--r--src/H5G.c4
-rw-r--r--src/H5R.c14
-rw-r--r--src/H5Shyper.c3
-rw-r--r--src/H5Spoint.c3
-rw-r--r--test/Makefile.in110
-rw-r--r--testpar/Makefile.in2
-rw-r--r--tools/Makefile.in34
-rw-r--r--tools/h5debug.c3
-rw-r--r--tools/h5ls.c4
11 files changed, 109 insertions, 104 deletions
diff --git a/config/commence.in b/config/commence.in
index 9eac277..33b0d32 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -40,7 +40,7 @@ PUB_LIB=$(LIB)
LT=$(top_builddir)/libtool
LT_COMPILE=$(LT) --mode=compile $(CC)
LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir)
-LT_LINK_EXE=$(LT) --mode=link $(CC)
+LT_LINK_EXE=$(LT) --mode=link $(CC) -rpath $(bindir)
LT_RUN=$(LT) --mode=execute
LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 1155112..801d71f 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -32,33 +32,33 @@ CLEAN=*.h5
# for building automatic dependencies.
PROG_SRC=h5_chunk_read.c h5_compound.c h5_extend_write.c h5_group.c \
h5_read.c h5_write.c h5_select.c h5_attribute.c
-PROG_OBJ=$(PROG_SRC:.c=.o)
+PROG_OBJ=$(PROG_SRC:.c=.lo)
# How to build the programs... they all depend on the hdf5 library
$(PROGS): $(LIBHDF5)
-h5_chunk_read: h5_chunk_read.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_chunk_read.o $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5_chunk_read: h5_chunk_read.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_chunk_read.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5_compound: h5_compound.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_compound.o $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5_compound: h5_compound.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_compound.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5_extend_write: h5_extend_write.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_extend_write.o $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5_extend_write: h5_extend_write.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_extend_write.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5_group: h5_group.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_group.o $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5_group: h5_group.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_group.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5_write: h5_write.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_write.o $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5_write: h5_write.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_write.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5_read: h5_read.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_read.o $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5_read: h5_read.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_read.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5_select: h5_select.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_select.o $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5_select: h5_select.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_select.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5_attribute: h5_attribute.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_attribute.o $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5_attribute: h5_attribute.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_attribute.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
@CONCLUDE@
diff --git a/src/H5G.c b/src/H5G.c
index 5250bf2..003bcc5 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -1991,7 +1991,7 @@ H5G_get_type(H5G_entry_t *ent)
for (i=H5G_ntypes_g; i>0; --i) {
if ((isa=(H5G_type_g[i-1].isa)(ent))<0) {
- HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
+ HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, H5G_UNKNOWN,
"unable to determine object type");
} else if (isa) {
HRETURN(H5G_type_g[i-1].type);
@@ -1999,7 +1999,7 @@ H5G_get_type(H5G_entry_t *ent)
}
if (0==i) {
- HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, FAIL,
+ HRETURN_ERROR(H5E_SYM, H5E_CANTINIT, H5G_UNKNOWN,
"unable to determine object type");
}
FUNC_LEAVE(H5G_UNKNOWN);
diff --git a/src/H5R.c b/src/H5R.c
index c0a412c..1ed1632 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -671,7 +671,7 @@ H5R_get_object_type(H5D_t *dset, void *_ref)
uint8_t *p; /* Pointer to OID to store */
intn ret_value = H5G_UNKNOWN;
- FUNC_ENTER(H5R_get_object_type, FAIL);
+ FUNC_ENTER(H5R_get_object_type, H5G_UNKNOWN);
assert(ref);
assert(dset);
@@ -719,16 +719,18 @@ int
H5Rget_object_type(hid_t dataset, void *_ref)
{
H5D_t *dset = NULL; /* dataset object */
- hid_t ret_value = FAIL;
+ hid_t ret_value = H5G_UNKNOWN;
- FUNC_ENTER(H5Rget_object_type, FAIL);
+ FUNC_ENTER(H5Rget_object_type, H5G_UNKNOWN);
H5TRACE2("Is","ix",dataset,_ref);
/* Check args */
- if (H5I_DATASET != H5I_get_type(dataset) || NULL == (dset = H5I_object(dataset)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset");
+ if (H5I_DATASET != H5I_get_type(dataset) ||
+ NULL == (dset = H5I_object(dataset)))
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "not a dataset");
if(_ref==NULL)
- HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, FAIL, "invalid reference pointer");
+ HGOTO_ERROR (H5E_ARGS, H5E_BADVALUE, H5G_UNKNOWN,
+ "invalid reference pointer");
/* Get the object information */
ret_value=H5R_get_object_type(dset,_ref);
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 3e4df79..f5ec498 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -114,7 +114,8 @@ static const hssize_t zero[H5O_LAYOUT_NDIMS]={0}; /* Array of zeros */
*/
static herr_t
H5S_hyper_init (const struct H5O_layout_t UNUSED *layout,
- const H5S_t *space, H5S_sel_iter_t *sel_iter, size_t *min_elem_out)
+ const H5S_t *space, H5S_sel_iter_t *sel_iter,
+ size_t UNUSED *min_elem_out)
{
FUNC_ENTER (H5S_hyper_init, FAIL);
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 7d8672a..dfdfa03 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -83,7 +83,8 @@ const H5S_mconv_t H5S_POINT_MCONV[1] = {{
*/
static herr_t
H5S_point_init (const struct H5O_layout_t UNUSED *layout,
- const H5S_t *space, H5S_sel_iter_t *sel_iter, size_t *min_elem_out)
+ const H5S_t *space, H5S_sel_iter_t *sel_iter,
+ size_t UNUSED *min_elem_out)
{
FUNC_ENTER (H5S_point_init, FAIL);
diff --git a/test/Makefile.in b/test/Makefile.in
index 99b201b..f535942 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -25,11 +25,11 @@ TIMINGS=iopipe chunk ragged overhead
# The libh5test.a library provides common support code for the tests. We link
# this library statically because some systems can only link executables to
# a single shared library and libhdf5 is much bigger than libh5test.
-LT_LINK_LIB=$(LT) --mode=link $(CC) -static
+LT_LINK_LIB=$(LT) --mode=link $(CC) -static -rpath $(libdir)
LIBHDF5=../src/libhdf5.la
-LIB=libh5test.a
+LIB=libh5test.la
LIB_SRC=h5test.c
-LIB_OBJ=$(LIB_SRC:.c=.o)
+LIB_OBJ=$(LIB_SRC:.c=.lo)
PUB_LIB=
# Temporary files. These files are the ones created by setting the
@@ -58,7 +58,7 @@ TEST_SRC=big.c bittests.c chunk.c cmpd_dset.c dsets.c dtypes.c extend.c \
iopipe.c istore.c lheap.c links.c mount.c mtime.c ohdr.c overhead.c \
ragged.c stab.c tattr.c testhdf5.c tfile.c th5s.c tmeta.c trefer.c \
tselect.c unlink.c enum.c
-TEST_OBJ=$(TEST_SRC:.c=.o)
+TEST_OBJ=$(TEST_SRC:.c=.lo)
# Private header files (not to be installed)...
PRIVATE_HDR=testhdf5.h
@@ -75,83 +75,83 @@ timings _timings: $(TIMINGS)
# How to build the tests... They all depend on the test and hdf5 libraries.
$(TEST_PROGS): $(LIB) $(LIBHDF5)
-TESTHDF5_OBJ=testhdf5.o tattr.o tfile.o tmeta.o trefer.o tselect.o th5s.o
+TESTHDF5_OBJ=testhdf5.lo tattr.lo tfile.lo tmeta.lo trefer.lo tselect.lo th5s.lo
testhdf5: $(TESTHDF5_OBJ)
@$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-lheap: lheap.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ lheap.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+lheap: lheap.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ lheap.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-ohdr: ohdr.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ ohdr.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+ohdr: ohdr.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ ohdr.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-stab: stab.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ stab.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+stab: stab.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ stab.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-gheap: gheap.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ gheap.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+gheap: gheap.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ gheap.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-dsets: dsets.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+dsets: dsets.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-bittests: bittests.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ bittests.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+bittests: bittests.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ bittests.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-dtypes: dtypes.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ dtypes.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+dtypes: dtypes.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ dtypes.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-hyperslab: hyperslab.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ hyperslab.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+hyperslab: hyperslab.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ hyperslab.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-istore: istore.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ istore.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+istore: istore.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ istore.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-cmpd_dset: cmpd_dset.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ cmpd_dset.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+cmpd_dset: cmpd_dset.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ cmpd_dset.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-extend: extend.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ extend.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+extend: extend.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ extend.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-external: external.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ external.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+external: external.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ external.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-iopipe: iopipe.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ iopipe.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+iopipe: iopipe.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ iopipe.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-big: big.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ big.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+big: big.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ big.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-links: links.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ links.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+links: links.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ links.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-chunk: chunk.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ chunk.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+chunk: chunk.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ chunk.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-mtime: mtime.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ mtime.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+mtime: mtime.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ mtime.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-ragged: ragged.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ ragged.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+ragged: ragged.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ ragged.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-unlink: unlink.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ unlink.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+unlink: unlink.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ unlink.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-overhead: overhead.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ overhead.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+overhead: overhead.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ overhead.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-fillval: fillval.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ fillval.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+fillval: fillval.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ fillval.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-mount: mount.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ mount.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+mount: mount.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ mount.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-flush1: flush1.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ flush1.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+flush1: flush1.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ flush1.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-flush2: flush2.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ flush2.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+flush2: flush2.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ flush2.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-enum: enum.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ enum.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+enum: enum.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ enum.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
@CONCLUDE@
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index edad712..7f20fc0 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -27,7 +27,7 @@ DISTCLEAN=go
# Test source files
TEST_SRC=testphdf5.c t_dset.c t_file.c t_mpi.c
-TEST_OBJ=$(TEST_SRC:.c=.o)
+TEST_OBJ=$(TEST_SRC:.c=.lo)
PRIVATE_HDR=testphdf5.h
# How to build the tests... They all depend on the hdf5 library
diff --git a/tools/Makefile.in b/tools/Makefile.in
index a28f9cf..3c22b1b 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -21,24 +21,24 @@ TEST_SCRIPTS=$(srcdir)/testh5dump.sh @TESTH5TOH4@
# These are our main targets: library and tools. We link this library
# statically because some systems can only link executables to a single
# shared library and libhdf5 is much bigger than libh5tools.
-LT_LINK_LIB=$(LT) --mode=link $(CC) -static
-LIB=libh5tools.a
+LT_LINK_LIB=$(LT) --mode=link $(CC) -static -rpath $(libdir)
+LIB=libh5tools.la
LIBHDF5=../src/libhdf5.la
PROGS=h5debug h5import h5ls h5repart h5dump @H5TOH4@
# Source and object files for the library; do not install
LIB_SRC=h5tools.c h5findshd.c
-LIB_OBJ=$(LIB_SRC:.c=.o)
+LIB_OBJ=$(LIB_SRC:.c=.lo)
PUB_LIB=
# Source and object files for programs...
PROG_SRC=h5debug.c h5import.c h5ls.c h5repart.c h5dump.c h5dumputil.c h5toh4.c
-PROG_OBJ=$(PROG_SRC:.c=.o)
+PROG_OBJ=$(PROG_SRC:.c=.lo)
PRIVATE_HDR=h5tools.h
# Source and object files for the tests
TEST_SRC=
-TEST_OBJ=$(TEST_SRC:.c=.o)
+TEST_OBJ=$(TEST_SRC:.c=.lo)
# Programs have to be built before they can be tested!
check test _test: $(PROGS)
@@ -47,22 +47,22 @@ check test _test: $(PROGS)
# the tools library compiled in this directory.
$(PROGS): $(LIB) ../src/libhdf5.la
-h5debug: h5debug.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5debug.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5debug: h5debug.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5debug.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5import: h5import.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5import.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5import: h5import.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5import.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5ls: h5ls.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5ls.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5ls: h5ls.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5ls.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5repart: h5repart.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5repart.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5repart: h5repart.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5repart.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5dump: h5dump.o h5dumputil.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5dump: h5dump.lo h5dumputil.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5dump.lo h5dumputil.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
-h5toh4: h5toh4.o
- @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5toh4.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+h5toh4: h5toh4.lo
+ @$(LT_LINK_EXE) $(CFLAGS) -o $@ h5toh4.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
@CONCLUDE@
diff --git a/tools/h5debug.c b/tools/h5debug.c
index 54c9d38..d842958 100644
--- a/tools/h5debug.c
+++ b/tools/h5debug.c
@@ -90,7 +90,8 @@ main(int argc, char *argv[])
printf("Reading signature at address ");
H5F_addr_print(stdout, &addr);
printf(" (rel)\n");
- if (H5F_block_read(f, &addr, (hsize_t)sizeof(sig), H5D_XFER_DFLT, sig)<0) {
+ if (H5F_block_read(f, &addr, (hsize_t)sizeof(sig), &H5F_xfer_dflt,
+ sig)<0) {
fprintf(stderr, "cannot read signature\n");
HDexit(3);
}
diff --git a/tools/h5ls.c b/tools/h5ls.c
index 1e08711..1648620 100644
--- a/tools/h5ls.c
+++ b/tools/h5ls.c
@@ -1448,10 +1448,10 @@ list (hid_t group, const char *name, void *_iter)
fullname = fix_name(iter->container, name);
if (fullname_g) {
n = display_string(stdout, fullname, TRUE);
- printf("%*s", MAX(0, 25-n), "");
+ printf("%*s ", MAX(0, 24-n), "");
} else {
n = display_string(stdout, name, TRUE);
- printf("%*s", MAX(0, 25-n), "");
+ printf("%*s ", MAX(0, 24-n), "");
}
/* Get object information */