[svn-r1149] ./configure.in

./configure		[REGENERATED]
./src/H5config.h.in	[REGENERATED]
./src/H5private.h
	Temporarily commented out the code that tries to link a simple
	MPI-IO application because I'm not sure how to pass $LDFLAGS
	and $LIBS to the compiler.

	Removed the `--enable-parallel=ibm' switch because the library
	we link with is either -lmpcc or -lmpcc_r but not both. The
	only way to tell is to see what compiler was specified (mpcc
	or mpcc_r) but if that compiler is specified then we don't
	need any libraries (the compiler script supplies them). That
	leaves just two choices: the user must use a compiler script:

	    CC=mpcc ./configure

	or the user must state which library is desired:

	    LDFLAGS='-lmpcc' ./configure --enable-parallel

	Checks for <setjmp.h>, longjmp(), and signal(). We don't check
	for setjmp() because it could be a macro (in fact, Posix
	requires it to be a macro) and if longjmp() is present then
	setjmp() is probably present too ;-)

./src/H5detect.c
	The alignment detection loop uses SIGBUS and setjmp/longjmp
	instead of fork/wait in order to get around bugs with forking
	in conjunction with mpich.  This hasn't been tested on the
	SP-2 yet but it does work on the DEC Alpha.

./test/Makefile.in
./testpar/Makefile.in
./tools/Makefile.in
	Changed the order that libraries are linked so -lhdf5 is
	always before $LDFLAGS.

12 files changed, 343 insertions, 972 deletions

diff --git a/README b/README
index 06a2b56..b5be2bf 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is hdf5-1.1.64 released on Thu Mar 18 04:21:58 CST 1999
+This is hdf5-1.1.65 released on Thu Mar 18 08:31:26 CST 1999
 Please refer to the INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/config/dec-flags b/config/dec-flags
index edb6695..09eff13 100644
--- a/config/dec-flags
+++ b/config/dec-flags
@@ -27,7 +27,7 @@ case "$cc_vendor-$cc_version" in
         cat <<EOF
     **
     ** This compiler may generate incorrect code when optimizations are
-    ** enabled. Please upgrade to at newer version (we're not sure which
+    ** enabled. Please upgrade to a newer version (we're not sure which
     ** version actually works) before reporting bugs to the HDF5 team.
     **
 EOF
diff --git a/configure b/configure
index 04cbeba..ea6fe7a 100755
--- a/configure
+++ b/configure
@@ -1827,7 +1827,7 @@ else
 fi
 done
 
-for ac_hdr in stddef.h
+for ac_hdr in stddef.h setjmp.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -3931,7 +3931,7 @@ else
 fi
 done
 
-for ac_func in _scrsize ioctl compress2 setsysinfo
+for ac_func in _scrsize ioctl
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:3938: checking for $ac_func" >&5
@@ -4143,7 +4143,7 @@ else
 fi
 done
 
-for ac_func in gettimeofday BSDgettimeofday difftime sigaction snprintf
+for ac_func in gettimeofday BSDgettimeofday difftime snprintf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:4150: checking for $ac_func" >&5
@@ -4198,26 +4198,80 @@ else
 fi
 done
 
+for ac_func in compress2 setsysinfo longjmp signal sigaction
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:4205: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 4210 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:4233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
 
 cat > conftest.$ac_ext <<EOF
-#line 4204 "configure"
+#line 4258 "configure"
 #include "confdefs.h"
 #include<sys/types.h>
 int main() {
 off64_t n = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   for ac_func in lseek64 fseek64
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4216: checking for $ac_func" >&5
+echo "configure:4270: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4221 "configure"
+#line 4275 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4240,7 +4294,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4275,12 +4329,12 @@ rm -f conftest*
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4279: checking for working const" >&5
+echo "configure:4333: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4284 "configure"
+#line 4338 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4329,7 +4383,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:4333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4350,21 +4404,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:4354: checking for inline" >&5
+echo "configure:4408: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 4361 "configure"
+#line 4415 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:4368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -4391,16 +4445,16 @@ esac
 
 
 echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6
-echo "configure:4395: checking for __attribute__ extension" >&5
+echo "configure:4449: checking for __attribute__ extension" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4397 "configure"
+#line 4451 "configure"
 #include "confdefs.h"
 
 int main() {
 int __attribute__((unused)) x
 ; return 0; }
 EOF
-if { (eval echo configure:4404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_ATTRIBUTE 1
@@ -4416,16 +4470,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6
-echo "configure:4420: checking for __FUNCTION__ extension" >&5
+echo "configure:4474: checking for __FUNCTION__ extension" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4422 "configure"
+#line 4476 "configure"
 #include "confdefs.h"
 
 int main() {
 (void)__FUNCTION__
 ; return 0; }
 EOF
-if { (eval echo configure:4429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_FUNCTION 1
@@ -4441,7 +4495,7 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking how to print long long""... $ac_c" 1>&6
-echo "configure:4445: checking how to print long long" >&5
+echo "configure:4499: checking how to print long long" >&5
 if eval "test \"`echo '$''{'hdf5_cv_printf_ll'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4450,7 +4504,7 @@ else
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4454 "configure"
+#line 4508 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -4461,7 +4515,7 @@ else
 	             sprintf(s,"%${hdf5_cv_printf_ll}d",x);
 	             exit (strcmp(s,"1099511627776"));}
 EOF
-if { (eval echo configure:4465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   break
 else
@@ -4481,7 +4535,7 @@ EOF
 
 
 echo $ac_n "checking for debug flags""... $ac_c" 1>&6
-echo "configure:4485: checking for debug flags" >&5
+echo "configure:4539: checking for debug flags" >&5
 # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
   enableval="$enable_debug"
@@ -4513,7 +4567,7 @@ if test "X" != "X$DEBUG_PKG"; then
 fi
 
 echo $ac_n "checking for API tracing""... $ac_c" 1>&6
-echo "configure:4517: checking for API tracing" >&5;
+echo "configure:4571: checking for API tracing" >&5;
 # Check whether --enable-trace or --disable-trace was given.
 if test "${enable_trace+set}" = set; then
   enableval="$enable_trace"
@@ -4539,7 +4593,7 @@ case "$CC_BASENAME" in
 	# exists.
 	PARALLEL=yes
 	echo $ac_n "checking for mpirun""... $ac_c" 1>&6
-echo "configure:4543: checking for mpirun" >&5
+echo "configure:4597: checking for mpirun" >&5
 
 	# Find the path where mpicc is located.
 	cmd=`echo $CC |cut -f1 -d' '`
@@ -4565,7 +4619,7 @@ echo "configure:4543: checking for mpirun" >&5
         fi
 	;;
 
-    mpcc)
+    mpcc|mpcc_r)
 	# The IBM compiler
 	PARALLEL=yes
 	;;
@@ -4584,7 +4638,7 @@ fi
 
 
 echo $ac_n "checking for parallel support files""... $ac_c" 1>&6
-echo "configure:4588: checking for parallel support files" >&5
+echo "configure:4642: checking for parallel support files" >&5
 case "X-$enable_parallel" in
     X-|X-no|X-none)
 	# Either we are not compiling for parallel or the header and library
@@ -4615,7 +4669,7 @@ case "X-$enable_parallel" in
 	# is missing.
 	PARALLEL=yes
 	echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6
-echo "configure:4619: checking for MPI_Init in -lmpich" >&5
+echo "configure:4673: checking for MPI_Init in -lmpich" >&5
 ac_lib_var=`echo mpich'_'MPI_Init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4623,7 +4677,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmpich  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4627 "configure"
+#line 4681 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4634,7 +4688,7 @@ int main() {
 MPI_Init()
 ; return 0; }
 EOF
-if { (eval echo configure:4638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4683,34 +4737,13 @@ EOF
 
     # Display what we found about running programs
     echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6
-echo "configure:4687: checking prefix for running on one processor" >&5
+echo "configure:4741: checking prefix for running on one processor" >&5
     echo "$ac_t""$RUNSERIAL" 1>&6
     echo $ac_n "checking prefix for running in parallel""... $ac_c" 1>&6
-echo "configure:4690: checking prefix for running in parallel" >&5
+echo "configure:4744: checking prefix for running in parallel" >&5
     echo "$ac_t""$RUNPARALLEL" 1>&6
 
     # Check that we can link a simple MPI and MPI-IO application
-    echo $ac_n "checking whether a simple MPI-IO program can be linked""... $ac_c" 1>&6
-echo "configure:4695: checking whether a simple MPI-IO program can be linked" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 4697 "configure"
-#include "confdefs.h"
-
-int main() {
-MPI_Init();MPI_File_open();
-; return 0; }
-EOF
-if { (eval echo configure:4704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  echo "$ac_t""yes" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""no" 1>&6
-	        { echo "configure: error: 'unable to link a simple MPI-IO application'" 1>&2; exit 1; }
-fi
-rm -f conftest*
 
 
     # There *must* be some way to run in parallel even if it's just the
diff --git a/configure.in b/configure.in
index 57cce1a..a6cad3f 100644
--- a/configure.in
+++ b/configure.in
@@ -172,7 +172,7 @@ AC_HEADER_STDC
 AC_HEADER_TIME
 dnl Unix
 AC_CHECK_HEADERS(sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h)
-AC_CHECK_HEADERS(stddef.h)
+AC_CHECK_HEADERS(stddef.h setjmp.h)
 dnl Windows
 AC_CHECK_HEADERS(io.h winsock.h sys/timeb.h)
 
@@ -386,7 +386,7 @@ dnl ----------------------------------------------------------------------
 dnl How do we figure out the width of a tty in characters?
 dnl
 AC_CHECK_FUNCS(_getvideoconfig gettextinfo GetConsoleScreenBufferInfo)
-AC_CHECK_FUNCS(_scrsize ioctl compress2 setsysinfo)
+AC_CHECK_FUNCS(_scrsize ioctl)
 
 AC_MSG_CHECKING(for struct videoconfig)
 AC_TRY_COMPILE(,[struct videoconfig w; w.numtextcols=0;],
@@ -417,8 +417,8 @@ dnl ----------------------------------------------------------------------
 dnl Check for functions.
 dnl
 AC_CHECK_FUNCS(getpwuid gethostname system getrusage fork waitpid)
-AC_CHECK_FUNCS(gettimeofday BSDgettimeofday difftime sigaction snprintf)
-
+AC_CHECK_FUNCS(gettimeofday BSDgettimeofday difftime snprintf)
+AC_CHECK_FUNCS(compress2 setsysinfo longjmp signal sigaction)
 AC_TRY_COMPILE([#include<sys/types.h>],
 	       [off64_t n = 0;],
 	       AC_CHECK_FUNCS(lseek64 fseek64),
@@ -594,7 +594,7 @@ case "$CC_BASENAME" in
         fi
 	;;
 
-    mpcc)
+    mpcc|mpcc_r)
 	# The IBM compiler
 	PARALLEL=yes
 	;;
@@ -676,11 +676,11 @@ if test "X-" != "X-$PARALLEL"; then
     AC_MSG_RESULT($RUNPARALLEL)
 
     # Check that we can link a simple MPI and MPI-IO application
-    AC_MSG_CHECKING(whether a simple MPI-IO program can be linked)
-    AC_TRY_LINK(,[MPI_Init();MPI_File_open();],
-		AC_MSG_RESULT(yes),
-		AC_MSG_RESULT(no)
-	        AC_MSG_ERROR('unable to link a simple MPI-IO application'))
+dnl    AC_MSG_CHECKING(whether a simple MPI-IO program can be linked)
+dnl    AC_TRY_LINK(,[MPI_Init();MPI_File_open();],
+dnl		AC_MSG_RESULT(yes),
+dnl		AC_MSG_RESULT(no)
+dnl	        AC_MSG_ERROR('unable to link a simple MPI-IO application'))
 
 
     # There *must* be some way to run in parallel even if it's just the
diff --git a/src/.distdep b/src/.distdep
index 3a8511b..a611fd6 100644
--- a/src/.distdep
+++ b/src/.distdep
@@ -26,10 +26,7 @@ H5.o: \
    H5Gprivate.h \
    H5Gpublic.h \
    H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h
+   H5Opublic.h
 H5A.o: \
    H5A.c \
    H5private.h \
@@ -61,7 +58,9 @@ H5A.o: \
    H5MMprivate.h \
    H5MMpublic.h \
    H5Pprivate.h \
-   H5Ppublic.h
+   H5Ppublic.h \
+   H5Apkg.h \
+   H5Aprivate.h
 H5AC.o: \
    H5AC.c \
    H5private.h \
@@ -73,7 +72,9 @@ H5AC.o: \
    H5Fprivate.h \
    H5Fpublic.h \
    H5Ipublic.h \
-   H5Dpublic.h
+   H5Dpublic.h \
+   H5Eprivate.h \
+   H5Epublic.h
 H5B.o: \
    H5B.c \
    H5private.h \
@@ -90,7 +91,9 @@ H5B.o: \
    H5Bpublic.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5MFprivate.h
+   H5MFprivate.h \
+   H5MFpublic.h \
+   H5MMprivate.h
 H5D.o: \
    H5D.c \
    H5private.h \
@@ -127,14 +130,18 @@ H5D.o: \
    H5MFpublic.h \
    H5MMprivate.h \
    H5MMpublic.h \
-   H5Pprivate.h
+   H5Pprivate.h \
+   H5Ppublic.h \
+   H5TBprivate.h
 H5E.o: \
    H5E.c \
    H5private.h \
    H5public.h \
    H5config.h \
    H5api_adpt.h \
-   H5Iprivate.h
+   H5Iprivate.h \
+   H5Ipublic.h \
+   H5Eprivate.h
 H5F.o: \
    H5F.c \
    H5private.h \
@@ -166,7 +173,9 @@ H5F.o: \
    H5ACprivate.h \
    H5ACpublic.h \
    H5Eprivate.h \
-   H5Epublic.h
+   H5Epublic.h \
+   H5MMprivate.h \
+   H5MMpublic.h
 H5Farray.o: \
    H5Farray.c \
    H5private.h \
@@ -193,7 +202,9 @@ H5Farray.o: \
    H5Zprivate.h \
    H5Zpublic.h \
    H5Eprivate.h \
-   H5Epublic.h
+   H5Epublic.h \
+   H5MFprivate.h \
+   H5MFpublic.h
 H5Fcore.o: \
    H5Fcore.c \
    H5private.h \
@@ -202,10 +213,7 @@ H5Fcore.o: \
    H5api_adpt.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h
+   H5Ipublic.h
 H5Ffamily.o: \
    H5Ffamily.c \
    H5private.h \
@@ -214,10 +222,7 @@ H5Ffamily.o: \
    H5api_adpt.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h
+   H5Ipublic.h
 H5Fistore.o: \
    H5Fistore.c \
    H5private.h \
@@ -244,7 +249,9 @@ H5Fistore.o: \
    H5Zprivate.h \
    H5Zpublic.h \
    H5Eprivate.h \
-   H5Epublic.h
+   H5Epublic.h \
+   H5MFprivate.h \
+   H5MFpublic.h
 H5Flow.o: \
    H5Flow.c \
    H5private.h \
@@ -253,10 +260,7 @@ H5Flow.o: \
    H5api_adpt.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h
+   H5Ipublic.h
 H5Fmpio.o: \
    H5Fmpio.c \
    H5private.h \
@@ -280,10 +284,7 @@ H5Fmpio.o: \
    H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h
+   H5Sprivate.h
 H5Fsec2.o: \
    H5Fsec2.c \
    H5private.h \
@@ -292,10 +293,7 @@ H5Fsec2.o: \
    H5api_adpt.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h
+   H5Ipublic.h
 H5Fsplit.o: \
    H5Fsplit.c \
    H5private.h \
@@ -307,7 +305,9 @@ H5Fsplit.o: \
    H5Ipublic.h \
    H5Fprivate.h \
    H5Fpublic.h \
-   H5Dpublic.h
+   H5Dpublic.h \
+   H5MFprivate.h \
+   H5MFpublic.h
 H5Fstdio.o: \
    H5Fstdio.c \
    H5private.h \
@@ -316,10 +316,7 @@ H5Fstdio.o: \
    H5api_adpt.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h
+   H5Ipublic.h
 H5G.o: \
    H5G.c \
    H5private.h \
@@ -353,10 +350,7 @@ H5G.o: \
    H5ACprivate.h \
    H5ACpublic.h \
    H5HLprivate.h \
-   H5HLpublic.h \
-   H5Iprivate.h \
-   H5MMprivate.h \
-   H5MMpublic.h
+   H5HLpublic.h
 H5Gent.o: \
    H5Gent.c \
    H5private.h \
@@ -375,10 +369,7 @@ H5Gent.o: \
    H5Gprivate.h \
    H5Gpublic.h \
    H5Bprivate.h \
-   H5Bpublic.h \
-   H5HLprivate.h \
-   H5HLpublic.h \
-   H5MMprivate.h
+   H5Bpublic.h
 H5Gnode.o: \
    H5Gnode.c \
    H5private.h \
@@ -410,7 +401,9 @@ H5Gnode.o: \
    H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h \
-   H5Sprivate.h
+   H5Sprivate.h \
+   H5Spublic.h \
+   H5Zprivate.h
 H5Gstab.o: \
    H5Gstab.c \
    H5private.h \
@@ -440,9 +433,7 @@ H5Gstab.o: \
    H5HGpublic.h \
    H5Tprivate.h \
    H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
+   H5Sprivate.h
 H5HG.o: \
    H5HG.c \
    H5private.h \
@@ -459,7 +450,9 @@ H5HG.o: \
    H5Epublic.h \
    H5HGprivate.h \
    H5HGpublic.h \
-   H5MFprivate.h
+   H5MFprivate.h \
+   H5MFpublic.h \
+   H5MMprivate.h
 H5HL.o: \
    H5HL.c \
    H5private.h \
@@ -476,14 +469,18 @@ H5HL.o: \
    H5Epublic.h \
    H5HLprivate.h \
    H5HLpublic.h \
-   H5MFprivate.h
+   H5MFprivate.h \
+   H5MFpublic.h \
+   H5MMprivate.h
 H5I.o: \
    H5I.c \
    H5private.h \
    H5public.h \
    H5config.h \
    H5api_adpt.h \
-   H5Iprivate.h
+   H5Iprivate.h \
+   H5Ipublic.h \
+   H5Eprivate.h
 H5MF.o: \
    H5MF.c \
    H5private.h \
@@ -492,17 +489,16 @@ H5MF.o: \
    H5api_adpt.h \
    H5Eprivate.h \
    H5Epublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h
+   H5Ipublic.h
 H5MM.o: \
    H5MM.c \
    H5private.h \
    H5public.h \
    H5config.h \
    H5api_adpt.h \
-   H5Eprivate.h
+   H5Eprivate.h \
+   H5Epublic.h \
+   H5Ipublic.h
 H5O.o: \
    H5O.c \
    H5private.h \
@@ -531,569 +527,7 @@ H5O.o: \
    H5HGprivate.h \
    H5HGpublic.h \
    H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5Oattr.o: \
-   H5Oattr.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5Ocomp.o: \
-   H5Ocomp.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5Ocont.o: \
-   H5Ocont.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5Odtype.o: \
-   H5Odtype.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5Oefl.o: \
-   H5Oefl.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5HLprivate.h \
-   H5HLpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h
-H5Ofill.o: \
-   H5Ofill.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Iprivate.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h
-H5Olayout.o: \
-   H5Olayout.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Dprivate.h \
-   H5Dpublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h
-H5Omtime.o: \
-   H5Omtime.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5Oname.o: \
-   H5Oname.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5Onull.o: \
-   H5Onull.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Ipublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h
-H5Osdspace.o: \
-   H5Osdspace.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5Oshared.o: \
-   H5Oshared.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5Ostab.o: \
-   H5Ostab.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5P.o: \
-   H5P.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Iprivate.h \
-   H5Ipublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Dprivate.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Eprivate.h
-H5RA.o: \
-   H5RA.c \
-   H5RAprivate.h \
-   H5RApublic.h \
-   H5Ipublic.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Dprivate.h \
-   H5Dpublic.h \
-   H5private.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Iprivate.h \
-   H5MMprivate.h \
-   H5MMpublic.h
-H5S.o: \
-   H5S.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Iprivate.h \
-   H5Ipublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h
-H5Smpio.o: \
-   H5Smpio.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h
-H5Snone.o: \
-   H5Snone.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Vprivate.h
-H5T.o: \
-   H5T.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Dprivate.h \
-   H5Dpublic.h \
-   H5Ipublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Iprivate.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Tpkg.h \
-   H5Rprivate.h
-H5Tbit.o: \
-   H5Tbit.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Iprivate.h \
-   H5Tpkg.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Rprivate.h \
-   H5Rpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h
-H5Tconv.o: \
-   H5Tconv.c \
-   H5Iprivate.h \
-   H5Ipublic.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5private.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Tpkg.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Rprivate.h \
-   H5Rpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h
+   H5Tpublic.h
 H5Tinit.o: \
    H5Tinit.c \
    H5private.h \
@@ -1115,200 +549,6 @@ H5Tinit.o: \
    H5Rprivate.h \
    H5Rpublic.h \
    H5Tprivate.h \
-   H5Tpublic.h
-H5TB.o: \
-   H5TB.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Iprivate.h \
-   H5Ipublic.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h
-H5V.o: \
-   H5V.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h
-H5Z.o: \
-   H5Z.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h
-H5R.o: \
-   H5R.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Iprivate.h \
-   H5Ipublic.h \
-   H5Dprivate.h \
-   H5Dpublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Eprivate.h
-H5Sall.o: \
-   H5Sall.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Vprivate.h
-H5Shyper.o: \
-   H5Shyper.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h \
-   H5Zprivate.h \
-   H5Zpublic.h \
-   H5Vprivate.h
-H5Spoint.o: \
-   H5Spoint.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
-   H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
    H5Tpublic.h \
-   H5Zprivate.h
-H5Sselect.o: \
-   H5Sselect.c \
-   H5private.h \
-   H5public.h \
-   H5config.h \
-   H5api_adpt.h \
-   H5Eprivate.h \
-   H5Epublic.h \
-   H5Ipublic.h \
-   H5Iprivate.h \
-   H5MMprivate.h \
-   H5MMpublic.h \
-   H5Sprivate.h \
-   H5Spublic.h \
-   H5Fprivate.h \
-   H5Fpublic.h \
-   H5Dpublic.h \
    H5Gprivate.h \
-   H5Gpublic.h \
-   H5Bprivate.h \
-   H5Bpublic.h \
-   H5Oprivate.h \
-   H5Opublic.h \
-   H5HGprivate.h \
-   H5HGpublic.h \
-   H5Tprivate.h \
-   H5Tpublic.h
+   H5Gpublic.h
diff --git a/src/H5config.h.in b/src/H5config.h.in
index eed36d5..0b8340e 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -173,6 +173,9 @@
 /* Define if you have the ioctl function.  */
 #undef HAVE_IOCTL
 
+/* Define if you have the longjmp function.  */
+#undef HAVE_LONGJMP
+
 /* Define if you have the lseek64 function.  */
 #undef HAVE_LSEEK64
 
@@ -182,6 +185,9 @@
 /* Define if you have the sigaction function.  */
 #undef HAVE_SIGACTION
 
+/* Define if you have the signal function.  */
+#undef HAVE_SIGNAL
+
 /* Define if you have the snprintf function.  */
 #undef HAVE_SNPRINTF
 
@@ -197,6 +203,9 @@
 /* Define if you have the <mfhdf.h> header file.  */
 #undef HAVE_MFHDF_H
 
+/* Define if you have the <setjmp.h> header file.  */
+#undef HAVE_SETJMP_H
+
 /* Define if you have the <stddef.h> header file.  */
 #undef HAVE_STDDEF_H
 
diff --git a/src/H5detect.c b/src/H5detect.c
index 5736846..0af2e9d 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -60,6 +60,7 @@ static unsigned long find_bias(int, int, int *, void *);
 static void precision (detected_t*);
 static void print_header(void);
 static size_t align_g[] = {1, 2, 4, 8, 16};
+static jmp_buf jbuf_g;
 
 
 /*-------------------------------------------------------------------------
@@ -241,6 +242,31 @@ precision (detected_t *d)
    precision (&(INFO));							      \
 }
 
+#if defined(HAVE_LONGJMP) && defined(HAVE_SIGNAL)
+#define ALIGNMENT(TYPE,ALIGN) {						      \
+    char		*_buf=NULL;					      \
+    volatile TYPE	_val=0;						      \
+    volatile size_t	_ano=0;						      \
+    void		(*_handler)(int) = signal(SIGBUS, sigbus_handler);    \
+									      \
+    _buf = malloc(sizeof(TYPE)+align_g[NELMTS(align_g)-1]);		      \
+    if (setjmp(jbuf_g)) _ano++;						      \
+    if (_ano<NELMTS(align_g)) {						      \
+	*((TYPE*)(_buf+align_g[_ano])) = _val; /*possible SIGBUS*/	      \
+	_val = *((TYPE*)(_buf+align_g[_ano]));  /*possible SIGBUS*/	      \
+	(ALIGN)=align_g[_ano];						      \
+    } else {								      \
+	(ALIGN)=0;							      \
+	fprintf(stderr, "unable to calculate alignment for %s\n", #TYPE);     \
+    }									      \
+    free(_buf);								      \
+    signal(SIGBUS, _handler); /*restore original handler*/		      \
+}
+#else
+#define ALIGNMENT(TYPE,ALIGN) (ALIGN)=0
+#endif
+
+#if 0
 #if defined(HAVE_FORK) && defined(HAVE_WAITPID)
 #define ALIGNMENT(TYPE,ALIGN) {						      \
     char	*_buf;							      \
@@ -285,8 +311,33 @@ precision (detected_t *d)
 #else
 #define ALIGNMENT(TYPE,ALIGN) (ALIGN)=0
 #endif
+#endif
 
-	
+
+/*-------------------------------------------------------------------------
+ * Function:	sigbus_handler
+ *
+ * Purpose:	Handler for SIGBUS. We use signal() instead of sigaction()
+ *		because it's more portable to non-Posix systems. Although
+ *		it's not nearly as nice to work with, it does the job for
+ *		this simple stuff.
+ *
+ * Return:	Returns via longjmp to jbuf_g.
+ *
+ * Programmer:	Robb Matzke
+ *              Thursday, March 18, 1999
+ *
+ * Modifications:
+ *
+ *-------------------------------------------------------------------------
+ */
+static void
+sigbus_handler(int __unused__ signo)
+{
+    longjmp(jbuf_g, 1);
+    signal(SIGBUS, sigbus_handler);
+}
+    
 
 /*-------------------------------------------------------------------------
  * Function:    print_results
diff --git a/src/H5private.h b/src/H5private.h
index 1dae62c..ecac81c 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -74,6 +74,13 @@
 #endif
 
 /*
+ * Longjumps are used to detect alignment constrants
+ */
+#ifdef HAVE_SETJMP_H
+#   include <setjmp.h>
+#endif
+
+/*
  * Resource usage is not Posix.1 but HDF5 uses it anyway for some performance
  * and debugging code if available.
  */
diff --git a/test/.distdep b/test/.distdep
index 68296c1..8e28539 100644
--- a/test/.distdep
+++ b/test/.distdep
@@ -28,7 +28,8 @@ h5test.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 big.o: \
    big.c \
    h5test.h \
@@ -59,7 +60,8 @@ big.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 bittests.o: \
    bittests.c \
    h5test.h \
@@ -90,7 +92,8 @@ bittests.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 chunk.o: \
    chunk.c \
    ../src/hdf5.h \
@@ -146,7 +149,8 @@ cmpd_dset.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 dsets.o: \
    dsets.c \
    h5test.h \
@@ -177,7 +181,8 @@ dsets.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 dtypes.o: \
    dtypes.c \
    h5test.h \
@@ -208,7 +213,8 @@ dtypes.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 extend.o: \
    extend.c \
    h5test.h \
@@ -239,7 +245,8 @@ extend.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 external.o: \
    external.c \
    h5test.h \
@@ -270,7 +277,8 @@ external.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 fillval.o: \
    fillval.c \
    h5test.h \
@@ -301,7 +309,8 @@ fillval.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 flush1.o: \
    flush1.c \
    h5test.h \
@@ -332,7 +341,8 @@ flush1.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 flush2.o: \
    flush2.c \
    h5test.h \
@@ -363,7 +373,8 @@ flush2.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 gheap.o: \
    gheap.c \
    h5test.h \
@@ -397,13 +408,16 @@ gheap.o: \
    ../src/H5Rprivate.h \
    ../src/H5Tprivate.h \
    ../src/H5Gprivate.h \
-   ../src/H5Bprivate.h
+   ../src/H5Bprivate.h \
+   ../src/H5Eprivate.h
 hyperslab.o: \
    hyperslab.c \
    ../src/H5private.h \
    ../src/H5public.h \
    ../src/H5config.h \
-   ../src/H5api_adpt.h
+   ../src/H5api_adpt.h \
+   ../src/H5MMprivate.h \
+   ../src/H5MMpublic.h
 iopipe.o: \
    iopipe.c \
    ../src/hdf5.h \
@@ -468,7 +482,8 @@ istore.o: \
    ../src/H5Sprivate.h \
    ../src/H5Zprivate.h \
    ../src/H5Iprivate.h \
-   ../src/H5Pprivate.h
+   ../src/H5Pprivate.h \
+   ../src/H5MMprivate.h
 lheap.o: \
    lheap.c \
    h5test.h \
@@ -502,7 +517,8 @@ lheap.o: \
    ../src/H5Rprivate.h \
    ../src/H5Tprivate.h \
    ../src/H5Gprivate.h \
-   ../src/H5Bprivate.h
+   ../src/H5Bprivate.h \
+   ../src/H5HLprivate.h
 links.o: \
    links.c \
    h5test.h \
@@ -533,7 +549,8 @@ links.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 mount.o: \
    mount.c \
    h5test.h \
@@ -564,7 +581,8 @@ mount.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 mtime.o: \
    mtime.c \
    h5test.h \
@@ -595,7 +613,8 @@ mtime.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
 ohdr.o: \
    ohdr.c \
    h5test.h \
@@ -632,7 +651,8 @@ ohdr.o: \
    ../src/H5Bprivate.h \
    ../src/H5Iprivate.h \
    ../src/H5Oprivate.h \
-   ../src/H5Sprivate.h
+   ../src/H5Sprivate.h \
+   ../src/H5Zprivate.h
 overhead.o: \
    overhead.c \
    ../src/hdf5.h \
@@ -717,7 +737,8 @@ stab.o: \
    ../src/H5Rprivate.h \
    ../src/H5Tprivate.h \
    ../src/H5Gprivate.h \
-   ../src/H5Bprivate.h
+   ../src/H5Bprivate.h \
+   ../src/H5Gpkg.h
 tattr.o: \
    tattr.c \
    testhdf5.h \
@@ -742,14 +763,18 @@ tattr.o: \
    ../src/H5Opublic.h \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
-   ../src/H5Rpublic.h
+   ../src/H5Rpublic.h \
+   ../src/H5RApublic.h \
+   ../src/H5Spublic.h
 testhdf5.o: \
    testhdf5.c \
    testhdf5.h \
    ../src/H5private.h \
    ../src/H5public.h \
    ../src/H5config.h \
-   ../src/H5api_adpt.h
+   ../src/H5api_adpt.h \
+   ../src/H5Eprivate.h \
+   ../src/H5Epublic.h
 tfile.o: \
    tfile.c \
    testhdf5.h \
@@ -764,8 +789,7 @@ tfile.o: \
    ../src/H5Bpublic.h \
    ../src/H5Fprivate.h \
    ../src/H5Fpublic.h \
-   ../src/H5Dpublic.h \
-   ../src/H5Pprivate.h
+   ../src/H5Dpublic.h
 th5s.o: \
    th5s.c \
    testhdf5.h \
@@ -792,8 +816,7 @@ th5s.o: \
    ../src/H5Tprivate.h \
    ../src/H5Tpublic.h \
    ../src/H5Zprivate.h \
-   ../src/H5Zpublic.h \
-   ../src/H5Pprivate.h
+   ../src/H5Zpublic.h
 tmeta.o: \
    tmeta.c \
    testhdf5.h \
@@ -803,9 +826,11 @@ tmeta.o: \
    ../src/H5api_adpt.h \
    ../src/H5Eprivate.h \
    ../src/H5Epublic.h \
-   ../src/H5Ipublic.h
-tselect.o: \
-   tselect.c \
+   ../src/H5Ipublic.h \
+   ../src/H5Fprivate.h \
+   ../src/H5Fpublic.h
+trefer.o: \
+   trefer.c \
    testhdf5.h \
    ../src/H5private.h \
    ../src/H5public.h \
@@ -828,20 +853,24 @@ tselect.o: \
    ../src/H5Opublic.h \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
-   ../src/H5Rpublic.h
-unlink.o: \
-   unlink.c \
-   h5test.h \
-   ../src/hdf5.h \
+   ../src/H5Rpublic.h \
+   ../src/H5RApublic.h \
+   ../src/H5Spublic.h
+tselect.o: \
+   tselect.c \
+   testhdf5.h \
+   ../src/H5private.h \
    ../src/H5public.h \
    ../src/H5config.h \
    ../src/H5api_adpt.h \
+   ../src/H5Eprivate.h \
+   ../src/H5Epublic.h \
    ../src/H5Ipublic.h \
+   ../src/hdf5.h \
    ../src/H5Apublic.h \
    ../src/H5ACpublic.h \
    ../src/H5Bpublic.h \
    ../src/H5Dpublic.h \
-   ../src/H5Epublic.h \
    ../src/H5Fpublic.h \
    ../src/H5Gpublic.h \
    ../src/H5HGpublic.h \
@@ -853,15 +882,9 @@ unlink.o: \
    ../src/H5Zpublic.h \
    ../src/H5Rpublic.h \
    ../src/H5RApublic.h \
-   ../src/H5Spublic.h \
-   ../src/H5Tpublic.h \
-   ../src/H5private.h \
-   ../src/H5Tpkg.h \
-   ../src/H5HGprivate.h \
-   ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
-enum.o: \
-   enum.c \
+   ../src/H5Spublic.h
+unlink.o: \
+   unlink.c \
    h5test.h \
    ../src/hdf5.h \
    ../src/H5public.h \
@@ -890,22 +913,21 @@ enum.o: \
    ../src/H5Tpkg.h \
    ../src/H5HGprivate.h \
    ../src/H5Fprivate.h \
-   ../src/H5Rprivate.h
-trefer.o: \
-   trefer.c \
-   testhdf5.h \
-   ../src/H5private.h \
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
+enum.o: \
+   enum.c \
+   h5test.h \
+   ../src/hdf5.h \
    ../src/H5public.h \
    ../src/H5config.h \
    ../src/H5api_adpt.h \
-   ../src/H5Eprivate.h \
-   ../src/H5Epublic.h \
    ../src/H5Ipublic.h \
-   ../src/hdf5.h \
    ../src/H5Apublic.h \
    ../src/H5ACpublic.h \
    ../src/H5Bpublic.h \
    ../src/H5Dpublic.h \
+   ../src/H5Epublic.h \
    ../src/H5Fpublic.h \
    ../src/H5Gpublic.h \
    ../src/H5HGpublic.h \
@@ -915,4 +937,13 @@ trefer.o: \
    ../src/H5Opublic.h \
    ../src/H5Ppublic.h \
    ../src/H5Zpublic.h \
-   ../src/H5Rpublic.h
+   ../src/H5Rpublic.h \
+   ../src/H5RApublic.h \
+   ../src/H5Spublic.h \
+   ../src/H5Tpublic.h \
+   ../src/H5private.h \
+   ../src/H5Tpkg.h \
+   ../src/H5HGprivate.h \
+   ../src/H5Fprivate.h \
+   ../src/H5Rprivate.h \
+   ../src/H5Tprivate.h
diff --git a/test/Makefile.in b/test/Makefile.in
index dcc5f2f..372ba0e 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -10,7 +10,6 @@ top_srcdir=@top_srcdir@
 # Add include directory to the C preprocessor flags and the h5test and hdf5
 # libraries to the library list.
 CPPFLAGS=-I. -I../src @CPPFLAGS@
-LIBS=../src/libhdf5.la @LIBS@
 
 # These are our main targets. They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
@@ -24,6 +23,7 @@ TIMINGS=iopipe chunk ragged overhead
 # 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
+LIBHDF5=../src/libhdf5.la
 LIB=libh5test.a
 LIB_SRC=h5test.c
 LIB_OBJ=$(LIB_SRC:.c=.o)
@@ -70,84 +70,84 @@ timings _timings: $(TIMINGS)
 	done;
 
 # How to build the tests...  They all depend on the test and hdf5 libraries.
-$(TEST_PROGS): $(LIB) ../src/libhdf5.la
+$(TEST_PROGS): $(LIB) $(LIBHDF5)
 TESTHDF5_OBJ=testhdf5.o tattr.o tfile.o tmeta.o trefer.o tselect.o th5s.o
 testhdf5: $(TESTHDF5_OBJ)
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 lheap: lheap.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ lheap.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ lheap.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 ohdr: ohdr.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ ohdr.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ ohdr.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 stab: stab.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ stab.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ stab.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 gheap: gheap.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ gheap.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ gheap.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 dsets: dsets.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 bittests: bittests.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ bittests.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ bittests.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 dtypes: dtypes.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ dtypes.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ dtypes.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 hyperslab: hyperslab.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ hyperslab.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ hyperslab.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 istore: istore.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ istore.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ istore.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 cmpd_dset: cmpd_dset.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ cmpd_dset.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ cmpd_dset.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 extend: extend.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ extend.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ extend.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 external: external.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ external.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ external.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 iopipe: iopipe.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ iopipe.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ iopipe.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 big: big.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ big.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ big.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 links: links.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ links.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ links.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 chunk: chunk.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ chunk.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ chunk.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 mtime: mtime.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ mtime.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ mtime.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 ragged: ragged.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ ragged.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ ragged.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 unlink: unlink.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ unlink.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ unlink.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 overhead: overhead.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ overhead.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ overhead.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 fillval: fillval.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ fillval.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ fillval.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 mount: mount.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ mount.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ mount.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 flush1: flush1.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ flush1.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ flush1.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 flush2: flush2.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ flush2.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ flush2.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 enum: enum.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ enum.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ enum.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 @CONCLUDE@
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index 64c3b50..cf20ddd 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -10,7 +10,7 @@ top_srcdir=@top_srcdir@
 # Add the include directory to the C preprocessor flags the the hdf5 library
 # to the library list.
 CPPFLAGS=-I. -I../src @CPPFLAGS@
-LIBS=../src/libhdf5.la @LIBS@
+LIBHDF5=../src/libhdf5.la
 
 # These tests are parallel
 RUNTEST=$(RUNPARALLEL)
@@ -31,6 +31,6 @@ PRIVATE_HDR=testphdf5.h
 $(TEST_PROGS): ../src/libhdf5.la
 
 testphdf5: $(TEST_OBJ)
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TEST_OBJ) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TEST_OBJ) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 @CONCLUDE@
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 723d930..28ea50b 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -10,7 +10,6 @@ top_srcdir=@top_srcdir@
 # Add include directory to the C preprocessor flags, add -lh5tools and
 # -lhdf5 to the list of libraries.
 CPPFLAGS=-I../src -I. @CPPFLAGS@
-LIBS=../src/libhdf5.la @LIBS@
 
 # Test programs and scripts.
 TEST_PROGS=
@@ -21,6 +20,7 @@ TEST_SCRIPTS=testh5dump.sh @TESTH5TOH4@
 # shared library and libhdf5 is much bigger than libh5tools.
 LT_LINK_LIB=$(LT) --mode=link $(CC) -static
 LIB=libh5tools.a
+LIBHDF5=../src/libhdf5.la
 PROGS=h5debug h5import h5ls h5repart h5dump @H5TOH4@
 
 # Source and object files for the library.
@@ -44,21 +44,21 @@ check test _test: $(PROGS)
 $(PROGS): $(LIB) ../src/libhdf5.la
 
 h5debug: h5debug.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5debug.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ h5debug.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 h5import: h5import.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5import.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ h5import.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 h5ls: h5ls.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5ls.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ h5ls.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 h5repart: h5repart.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5repart.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ h5repart.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 h5dump: h5dump.o h5dumputil.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 h5toh4: h5toh4.o
-	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5toh4.o $(LIB) $(LDFLAGS) $(LIBS)
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ h5toh4.o $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS)
 
 @CONCLUDE@