[svn-r1217] Changes since 19990426

----------------------

./config/commence.in
./examples/Makefile.in
./test/Makefile.in
./testpar/Makefile.in
./tools/Makefile.in
	Fixed some dependency problems in Makefiles. If the library
	version is updated then everything gets recompiled.

./src/H5G.c
./src/H5R.c
	Failure return value for object type functions is now
	H5G_UNKNOWN as documented.

./src/H5Shyper.c
./src/H5Spoint.c
	Fixed an unused argument warning.

./tools/h5debug.c
	Fixed a call to H5F_block_read() since the 4th argument is
	different now.

./tools/h5ls.c
	Added a space between the object name and class to make the
	output readable when the object name is longer than 24
	characters.

C

3 files changed, 21 insertions, 20 deletions

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 */