[svn-r10158] Purpose:

Automake version upgrade

Description:
Upgraded automake version from 1.6.2 to 1.9.5.
Changed bin/reconfigure script to use automake 1.9.5.
Changed configure.in and Makefiles to use new FCFLAGS and FC variables
instead of FFLAGS and F9X.
Automake and configure should now do the lion's share of the work
supporting Fortran 9X; macros in acsite.m4 are now mostly unused (will
be cleaned later).
Altered how configure handles pmake; now root-level Makefile.in is
processed by bin/reconfigure to have a .MAKEFLAGS target, since
automake no longer allows us to define unused variables.
Configure now always checks for C++ compiler even if it is not
used, since automake thinks this is the Right Thing To Do and
will break otherwise.

Platforms tested:
Sol, copper, heping, mir, sleipnir, eirene, pommier, kelgia, modi4.

1 files changed, 428 insertions, 393 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index 568488b..c30bac5 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# Makefile.in generated by automake 1.9.5 from Makefile.am.
 # @configure_input@
 
-# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -29,93 +29,320 @@
 #
 # HDF5 Library Test Makefile(.in)
 #
-SHELL = @SHELL@
+SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c cache.c cmpd_dset.c dangle.c dsets.c dtransform.c dtypes.c enum.c err_compat.c error_test.c extend.c external.c file_handle.c filename.c fillval.c flush1.c flush2.c getname.c gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c ntypes.c ohdr.c reserved.c set_extent.c srb_append.c srb_read.c srb_write.c stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
-
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = @program_transform_name@
+transform = $(program_transform_name)
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-host_alias = @host_alias@
+build_triplet = @build@
 host_triplet = @host@
-
-EXEEXT = @EXEEXT@
-OBJEXT = @OBJEXT@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-
-# Install directories that automake doesn't know about
-includedir = $(exec_prefix)/include
-
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/config/commence.am \
+	$(top_srcdir)/config/conclude.am
+check_PROGRAMS = $(am__EXEEXT_1) error_test$(EXEEXT) \
+	err_compat$(EXEEXT) testmeta$(EXEEXT)
+subdir = test
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/src/H5config.h
+CONFIG_CLEAN_FILES =
+am__DEPENDENCIES_1 = $(top_builddir)/src/libhdf5.la
+libh5test_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+am_libh5test_la_OBJECTS = h5test.lo testframe.lo
+libh5test_la_OBJECTS = $(am_libh5test_la_OBJECTS)
+am__EXEEXT_1 = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
+	stab$(EXEEXT) gheap$(EXEEXT) cache$(EXEEXT) hyperslab$(EXEEXT) \
+	istore$(EXEEXT) bittests$(EXEEXT) dtypes$(EXEEXT) \
+	dsets$(EXEEXT) cmpd_dset$(EXEEXT) extend$(EXEEXT) \
+	external$(EXEEXT) links$(EXEEXT) unlink$(EXEEXT) big$(EXEEXT) \
+	mtime$(EXEEXT) fillval$(EXEEXT) mount$(EXEEXT) flush1$(EXEEXT) \
+	flush2$(EXEEXT) enum$(EXEEXT) set_extent$(EXEEXT) \
+	srb_write$(EXEEXT) srb_append$(EXEEXT) srb_read$(EXEEXT) \
+	ttsafe$(EXEEXT) stream_test$(EXEEXT) getname$(EXEEXT) \
+	file_handle$(EXEEXT) ntypes$(EXEEXT) dangle$(EXEEXT) \
+	dtransform$(EXEEXT) filename$(EXEEXT) reserved$(EXEEXT) \
+	btree2$(EXEEXT)
+big_SOURCES = big.c
+big_OBJECTS = big.$(OBJEXT)
+big_LDADD = $(LDADD)
+big_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+bittests_SOURCES = bittests.c
+bittests_OBJECTS = bittests.$(OBJEXT)
+bittests_LDADD = $(LDADD)
+bittests_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+btree2_SOURCES = btree2.c
+btree2_OBJECTS = btree2.$(OBJEXT)
+btree2_LDADD = $(LDADD)
+btree2_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+cache_SOURCES = cache.c
+cache_OBJECTS = cache.$(OBJEXT)
+cache_LDADD = $(LDADD)
+cache_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+cmpd_dset_SOURCES = cmpd_dset.c
+cmpd_dset_OBJECTS = cmpd_dset.$(OBJEXT)
+cmpd_dset_LDADD = $(LDADD)
+cmpd_dset_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+dangle_SOURCES = dangle.c
+dangle_OBJECTS = dangle.$(OBJEXT)
+dangle_LDADD = $(LDADD)
+dangle_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+dsets_SOURCES = dsets.c
+dsets_OBJECTS = dsets.$(OBJEXT)
+dsets_LDADD = $(LDADD)
+dsets_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+dtransform_SOURCES = dtransform.c
+dtransform_OBJECTS = dtransform.$(OBJEXT)
+dtransform_LDADD = $(LDADD)
+dtransform_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+dtypes_SOURCES = dtypes.c
+dtypes_OBJECTS = dtypes.$(OBJEXT)
+dtypes_LDADD = $(LDADD)
+dtypes_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+enum_SOURCES = enum.c
+enum_OBJECTS = enum.$(OBJEXT)
+enum_LDADD = $(LDADD)
+enum_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+err_compat_SOURCES = err_compat.c
+err_compat_OBJECTS = err_compat.$(OBJEXT)
+err_compat_LDADD = $(LDADD)
+err_compat_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+error_test_SOURCES = error_test.c
+error_test_OBJECTS = error_test.$(OBJEXT)
+error_test_LDADD = $(LDADD)
+error_test_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+extend_SOURCES = extend.c
+extend_OBJECTS = extend.$(OBJEXT)
+extend_LDADD = $(LDADD)
+extend_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+external_SOURCES = external.c
+external_OBJECTS = external.$(OBJEXT)
+external_LDADD = $(LDADD)
+external_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+file_handle_SOURCES = file_handle.c
+file_handle_OBJECTS = file_handle.$(OBJEXT)
+file_handle_LDADD = $(LDADD)
+file_handle_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+filename_SOURCES = filename.c
+filename_OBJECTS = filename.$(OBJEXT)
+filename_LDADD = $(LDADD)
+filename_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+fillval_SOURCES = fillval.c
+fillval_OBJECTS = fillval.$(OBJEXT)
+fillval_LDADD = $(LDADD)
+fillval_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+flush1_SOURCES = flush1.c
+flush1_OBJECTS = flush1.$(OBJEXT)
+flush1_LDADD = $(LDADD)
+flush1_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+flush2_SOURCES = flush2.c
+flush2_OBJECTS = flush2.$(OBJEXT)
+flush2_LDADD = $(LDADD)
+flush2_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+getname_SOURCES = getname.c
+getname_OBJECTS = getname.$(OBJEXT)
+getname_LDADD = $(LDADD)
+getname_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+gheap_SOURCES = gheap.c
+gheap_OBJECTS = gheap.$(OBJEXT)
+gheap_LDADD = $(LDADD)
+gheap_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+hyperslab_SOURCES = hyperslab.c
+hyperslab_OBJECTS = hyperslab.$(OBJEXT)
+hyperslab_LDADD = $(LDADD)
+hyperslab_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+istore_SOURCES = istore.c
+istore_OBJECTS = istore.$(OBJEXT)
+istore_LDADD = $(LDADD)
+istore_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+lheap_SOURCES = lheap.c
+lheap_OBJECTS = lheap.$(OBJEXT)
+lheap_LDADD = $(LDADD)
+lheap_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+links_SOURCES = links.c
+links_OBJECTS = links.$(OBJEXT)
+links_LDADD = $(LDADD)
+links_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+mount_SOURCES = mount.c
+mount_OBJECTS = mount.$(OBJEXT)
+mount_LDADD = $(LDADD)
+mount_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+mtime_SOURCES = mtime.c
+mtime_OBJECTS = mtime.$(OBJEXT)
+mtime_LDADD = $(LDADD)
+mtime_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+ntypes_SOURCES = ntypes.c
+ntypes_OBJECTS = ntypes.$(OBJEXT)
+ntypes_LDADD = $(LDADD)
+ntypes_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+ohdr_SOURCES = ohdr.c
+ohdr_OBJECTS = ohdr.$(OBJEXT)
+ohdr_LDADD = $(LDADD)
+ohdr_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+reserved_SOURCES = reserved.c
+reserved_OBJECTS = reserved.$(OBJEXT)
+reserved_LDADD = $(LDADD)
+reserved_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+set_extent_SOURCES = set_extent.c
+set_extent_OBJECTS = set_extent.$(OBJEXT)
+set_extent_LDADD = $(LDADD)
+set_extent_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+srb_append_SOURCES = srb_append.c
+srb_append_OBJECTS = srb_append.$(OBJEXT)
+srb_append_LDADD = $(LDADD)
+srb_append_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+srb_read_SOURCES = srb_read.c
+srb_read_OBJECTS = srb_read.$(OBJEXT)
+srb_read_LDADD = $(LDADD)
+srb_read_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+srb_write_SOURCES = srb_write.c
+srb_write_OBJECTS = srb_write.$(OBJEXT)
+srb_write_LDADD = $(LDADD)
+srb_write_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+stab_SOURCES = stab.c
+stab_OBJECTS = stab.$(OBJEXT)
+stab_LDADD = $(LDADD)
+stab_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+stream_test_SOURCES = stream_test.c
+stream_test_OBJECTS = stream_test.$(OBJEXT)
+stream_test_LDADD = $(LDADD)
+stream_test_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tarray.$(OBJEXT) \
+	tattr.$(OBJEXT) tconfig.$(OBJEXT) tfile.$(OBJEXT) \
+	tgenprop.$(OBJEXT) th5s.$(OBJEXT) theap.$(OBJEXT) \
+	tid.$(OBJEXT) titerate.$(OBJEXT) tmeta.$(OBJEXT) \
+	tmisc.$(OBJEXT) ttime.$(OBJEXT) trefer.$(OBJEXT) \
+	trefstr.$(OBJEXT) tselect.$(OBJEXT) tskiplist.$(OBJEXT) \
+	ttst.$(OBJEXT) tvltypes.$(OBJEXT) tvlstr.$(OBJEXT)
+testhdf5_OBJECTS = $(am_testhdf5_OBJECTS)
+testhdf5_LDADD = $(LDADD)
+testhdf5_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+testmeta_SOURCES = testmeta.c
+testmeta_OBJECTS = testmeta.$(OBJEXT)
+testmeta_LDADD = $(LDADD)
+testmeta_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+am_ttsafe_OBJECTS = ttsafe.$(OBJEXT) ttsafe_dcreate.$(OBJEXT) \
+	ttsafe_error.$(OBJEXT) ttsafe_cancel.$(OBJEXT) \
+	ttsafe_acreate.$(OBJEXT)
+ttsafe_OBJECTS = $(am_ttsafe_OBJECTS)
+ttsafe_LDADD = $(LDADD)
+ttsafe_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+unlink_SOURCES = unlink.c
+unlink_OBJECTS = unlink.$(OBJEXT)
+unlink_LDADD = $(LDADD)
+unlink_DEPENDENCIES = libh5test.la $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src
+depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
+am__depfiles_maybe = depfiles
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c cache.c \
+	cmpd_dset.c dangle.c dsets.c dtransform.c dtypes.c enum.c \
+	err_compat.c error_test.c extend.c external.c file_handle.c \
+	filename.c fillval.c flush1.c flush2.c getname.c gheap.c \
+	hyperslab.c istore.c lheap.c links.c mount.c mtime.c ntypes.c \
+	ohdr.c reserved.c set_extent.c srb_append.c srb_read.c \
+	srb_write.c stab.c stream_test.c $(testhdf5_SOURCES) \
+	testmeta.c $(ttsafe_SOURCES) unlink.c
+DIST_SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c \
+	cache.c cmpd_dset.c dangle.c dsets.c dtransform.c dtypes.c \
+	enum.c err_compat.c error_test.c extend.c external.c \
+	file_handle.c filename.c fillval.c flush1.c flush2.c getname.c \
+	gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c \
+	ntypes.c ohdr.c reserved.c set_extent.c srb_append.c \
+	srb_read.c srb_write.c stab.c stream_test.c \
+	$(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 # Set the paths for autotools to be correct on heping.
 # Ideally, these tools should never be needed during the build.
 ACLOCAL = /usr/bin/aclocal
-AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
-AUTOMAKE = /usr/bin/automake
-AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
 ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AM_MAKEFLAGS = @AM_MAKEFLAGS@
 AR = @AR@
-AS = @AS@
+AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
+AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
+AUTOMAKE = /usr/bin/automake
 AWK = @AWK@
+BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
+BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
+BUILD_FORTRAN_CONDITIONAL_FALSE = @BUILD_FORTRAN_CONDITIONAL_FALSE@
+BUILD_FORTRAN_CONDITIONAL_TRUE = @BUILD_FORTRAN_CONDITIONAL_TRUE@
+BUILD_HDF5_HL_CONDITIONAL_FALSE = @BUILD_HDF5_HL_CONDITIONAL_FALSE@
+BUILD_HDF5_HL_CONDITIONAL_TRUE = @BUILD_HDF5_HL_CONDITIONAL_TRUE@
+BUILD_PABLO_CONDITIONAL_FALSE = @BUILD_PABLO_CONDITIONAL_FALSE@
+BUILD_PABLO_CONDITIONAL_TRUE = @BUILD_PABLO_CONDITIONAL_TRUE@
+BUILD_PARALLEL_CONDITIONAL_FALSE = @BUILD_PARALLEL_CONDITIONAL_FALSE@
+BUILD_PARALLEL_CONDITIONAL_TRUE = @BUILD_PARALLEL_CONDITIONAL_TRUE@
 BUILD_PDB2HDF = @BUILD_PDB2HDF@
+BUILD_PDB2HDF_CONDITIONAL_FALSE = @BUILD_PDB2HDF_CONDITIONAL_FALSE@
+BUILD_PDB2HDF_CONDITIONAL_TRUE = @BUILD_PDB2HDF_CONDITIONAL_TRUE@
 BYTESEX = @BYTESEX@
 CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CC_VERSION = @CC_VERSION@
+CFLAGS = @CFLAGS@
 CONFIG_DATE = @CONFIG_DATE@
 CONFIG_MODE = @CONFIG_MODE@
 CONFIG_USER = @CONFIG_USER@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
+DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
 EGREP = @EGREP@
+EXEEXT = @EXEEXT@
 F77 = @F77@
+
+# Make sure that these variables are exported to the Makefiles
+F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
 F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
+FCFLAGS = @FCFLAGS@
 FFLAGS = @FFLAGS@
 FILTERS = @FILTERS@
 FSEARCH_DIRS = @FSEARCH_DIRS@
-GCJ = @GCJ@
-GCJFLAGS = @GCJFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@
@@ -125,21 +352,36 @@ HL_FOR = @HL_FOR@
 HSIZET = @HSIZET@
 HSIZE_T = @HSIZE_T@
 HSSIZE_T = @HSSIZE_T@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
 LT_STATIC_EXEC = @LT_STATIC_EXEC@
 MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
 MPE = @MPE@
-OBJDUMP = @OBJDUMP@
 OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
+OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
 PARALLEL = @PARALLEL@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PTHREAD = @PTHREAD@
 RANLIB = @RANLIB@
-RC = @RC@
 ROOT = @ROOT@
 RUNPARALLEL = @RUNPARALLEL@
 RUNSERIAL = @RUNSERIAL@
@@ -147,6 +389,8 @@ R_INTEGER = @R_INTEGER@
 R_LARGE = @R_LARGE@
 SEARCH = @SEARCH@
 SETX = @SETX@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
 SIZE_T = @SIZE_T@
 SRB = @SRB@
 STATIC_SHARED = @STATIC_SHARED@
@@ -161,9 +405,52 @@ USE_FILTER_SCALEOFFSET = @USE_FILTER_SCALEOFFSET@
 USE_FILTER_SHUFFLE = @USE_FILTER_SHUFFLE@
 USE_FILTER_SZIP = @USE_FILTER_SZIP@
 VERSION = @VERSION@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_FC = @ac_ct_FC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
+am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+
+# Install directories that automake doesn't know about
+includedir = $(exec_prefix)/include
+infodir = @infodir@
 install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
 
 # Shell commands used in Makefiles
 RM = rm -f
@@ -185,11 +472,6 @@ H5CC = $(bindir)/h5cc
 H5CC_PP = $(bindir)/h5pcc
 H5FC = $(bindir)/h5fc
 H5FC_PP = $(bindir)/h5pfc
-
-# Make sure that these variables are exported to the Makefiles
-F9XMODEXT = @F9XMODEXT@
-F9XMODFLAG = @F9XMODFLAG@
-
 INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
 
 # Test script for error_test and err_compat
@@ -206,13 +488,6 @@ TEST_PROG = testhdf5 lheap ohdr stab gheap cache hyperslab istore bittests     \
            btree2
 
 
-# List programs to be built when testing here. error_test and err_compat are
-# built at the same time as the other tests, but executed by testerror.sh.
-# 'make check' doesn't run them directly, so they are not included in TEST_PROG.
-# Also build testmeta, which is used for timings test.  It builds quickly,
-# and this lets automake keep all its test programs in one place.
-check_PROGRAMS = $(TEST_PROG) error_test err_compat testmeta
-
 # The libh5test.a library provides common support code for the tests.
 check_LTLIBRARIES = libh5test.la
 libh5test_la_SOURCES = h5test.c testframe.c
@@ -270,309 +545,45 @@ PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS)   \
         $(EXTRA_PROG)
 
 TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST) 
-subdir = test
-mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/src/H5config.h
-CONFIG_CLEAN_FILES =
-libh5test_la_DEPENDENCIES = $(top_builddir)/src/libhdf5.la
-am_libh5test_la_OBJECTS = h5test.lo testframe.lo
-libh5test_la_OBJECTS = $(am_libh5test_la_OBJECTS)
-check_PROGRAMS = testhdf5$(EXEEXT) lheap$(EXEEXT) ohdr$(EXEEXT) \
-	stab$(EXEEXT) gheap$(EXEEXT) cache$(EXEEXT) hyperslab$(EXEEXT) \
-	istore$(EXEEXT) bittests$(EXEEXT) dtypes$(EXEEXT) \
-	dsets$(EXEEXT) cmpd_dset$(EXEEXT) extend$(EXEEXT) \
-	external$(EXEEXT) links$(EXEEXT) unlink$(EXEEXT) big$(EXEEXT) \
-	mtime$(EXEEXT) fillval$(EXEEXT) mount$(EXEEXT) flush1$(EXEEXT) \
-	flush2$(EXEEXT) enum$(EXEEXT) set_extent$(EXEEXT) \
-	srb_write$(EXEEXT) srb_append$(EXEEXT) srb_read$(EXEEXT) \
-	ttsafe$(EXEEXT) stream_test$(EXEEXT) getname$(EXEEXT) \
-	file_handle$(EXEEXT) ntypes$(EXEEXT) dangle$(EXEEXT) \
-	dtransform$(EXEEXT) filename$(EXEEXT) reserved$(EXEEXT) \
-	btree2$(EXEEXT) error_test$(EXEEXT) err_compat$(EXEEXT) \
-	testmeta$(EXEEXT)
-big_SOURCES = big.c
-big_OBJECTS = big.$(OBJEXT)
-big_LDADD = $(LDADD)
-big_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-big_LDFLAGS =
-bittests_SOURCES = bittests.c
-bittests_OBJECTS = bittests.$(OBJEXT)
-bittests_LDADD = $(LDADD)
-bittests_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-bittests_LDFLAGS =
-btree2_SOURCES = btree2.c
-btree2_OBJECTS = btree2.$(OBJEXT)
-btree2_LDADD = $(LDADD)
-btree2_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-btree2_LDFLAGS =
-cache_SOURCES = cache.c
-cache_OBJECTS = cache.$(OBJEXT)
-cache_LDADD = $(LDADD)
-cache_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-cache_LDFLAGS =
-cmpd_dset_SOURCES = cmpd_dset.c
-cmpd_dset_OBJECTS = cmpd_dset.$(OBJEXT)
-cmpd_dset_LDADD = $(LDADD)
-cmpd_dset_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-cmpd_dset_LDFLAGS =
-dangle_SOURCES = dangle.c
-dangle_OBJECTS = dangle.$(OBJEXT)
-dangle_LDADD = $(LDADD)
-dangle_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-dangle_LDFLAGS =
-dsets_SOURCES = dsets.c
-dsets_OBJECTS = dsets.$(OBJEXT)
-dsets_LDADD = $(LDADD)
-dsets_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-dsets_LDFLAGS =
-dtransform_SOURCES = dtransform.c
-dtransform_OBJECTS = dtransform.$(OBJEXT)
-dtransform_LDADD = $(LDADD)
-dtransform_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-dtransform_LDFLAGS =
-dtypes_SOURCES = dtypes.c
-dtypes_OBJECTS = dtypes.$(OBJEXT)
-dtypes_LDADD = $(LDADD)
-dtypes_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-dtypes_LDFLAGS =
-enum_SOURCES = enum.c
-enum_OBJECTS = enum.$(OBJEXT)
-enum_LDADD = $(LDADD)
-enum_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-enum_LDFLAGS =
-err_compat_SOURCES = err_compat.c
-err_compat_OBJECTS = err_compat.$(OBJEXT)
-err_compat_LDADD = $(LDADD)
-err_compat_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-err_compat_LDFLAGS =
-error_test_SOURCES = error_test.c
-error_test_OBJECTS = error_test.$(OBJEXT)
-error_test_LDADD = $(LDADD)
-error_test_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-error_test_LDFLAGS =
-extend_SOURCES = extend.c
-extend_OBJECTS = extend.$(OBJEXT)
-extend_LDADD = $(LDADD)
-extend_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-extend_LDFLAGS =
-external_SOURCES = external.c
-external_OBJECTS = external.$(OBJEXT)
-external_LDADD = $(LDADD)
-external_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-external_LDFLAGS =
-file_handle_SOURCES = file_handle.c
-file_handle_OBJECTS = file_handle.$(OBJEXT)
-file_handle_LDADD = $(LDADD)
-file_handle_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-file_handle_LDFLAGS =
-filename_SOURCES = filename.c
-filename_OBJECTS = filename.$(OBJEXT)
-filename_LDADD = $(LDADD)
-filename_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-filename_LDFLAGS =
-fillval_SOURCES = fillval.c
-fillval_OBJECTS = fillval.$(OBJEXT)
-fillval_LDADD = $(LDADD)
-fillval_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-fillval_LDFLAGS =
-flush1_SOURCES = flush1.c
-flush1_OBJECTS = flush1.$(OBJEXT)
-flush1_LDADD = $(LDADD)
-flush1_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-flush1_LDFLAGS =
-flush2_SOURCES = flush2.c
-flush2_OBJECTS = flush2.$(OBJEXT)
-flush2_LDADD = $(LDADD)
-flush2_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-flush2_LDFLAGS =
-getname_SOURCES = getname.c
-getname_OBJECTS = getname.$(OBJEXT)
-getname_LDADD = $(LDADD)
-getname_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-getname_LDFLAGS =
-gheap_SOURCES = gheap.c
-gheap_OBJECTS = gheap.$(OBJEXT)
-gheap_LDADD = $(LDADD)
-gheap_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-gheap_LDFLAGS =
-hyperslab_SOURCES = hyperslab.c
-hyperslab_OBJECTS = hyperslab.$(OBJEXT)
-hyperslab_LDADD = $(LDADD)
-hyperslab_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-hyperslab_LDFLAGS =
-istore_SOURCES = istore.c
-istore_OBJECTS = istore.$(OBJEXT)
-istore_LDADD = $(LDADD)
-istore_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-istore_LDFLAGS =
-lheap_SOURCES = lheap.c
-lheap_OBJECTS = lheap.$(OBJEXT)
-lheap_LDADD = $(LDADD)
-lheap_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-lheap_LDFLAGS =
-links_SOURCES = links.c
-links_OBJECTS = links.$(OBJEXT)
-links_LDADD = $(LDADD)
-links_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-links_LDFLAGS =
-mount_SOURCES = mount.c
-mount_OBJECTS = mount.$(OBJEXT)
-mount_LDADD = $(LDADD)
-mount_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-mount_LDFLAGS =
-mtime_SOURCES = mtime.c
-mtime_OBJECTS = mtime.$(OBJEXT)
-mtime_LDADD = $(LDADD)
-mtime_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-mtime_LDFLAGS =
-ntypes_SOURCES = ntypes.c
-ntypes_OBJECTS = ntypes.$(OBJEXT)
-ntypes_LDADD = $(LDADD)
-ntypes_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-ntypes_LDFLAGS =
-ohdr_SOURCES = ohdr.c
-ohdr_OBJECTS = ohdr.$(OBJEXT)
-ohdr_LDADD = $(LDADD)
-ohdr_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-ohdr_LDFLAGS =
-reserved_SOURCES = reserved.c
-reserved_OBJECTS = reserved.$(OBJEXT)
-reserved_LDADD = $(LDADD)
-reserved_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-reserved_LDFLAGS =
-set_extent_SOURCES = set_extent.c
-set_extent_OBJECTS = set_extent.$(OBJEXT)
-set_extent_LDADD = $(LDADD)
-set_extent_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-set_extent_LDFLAGS =
-srb_append_SOURCES = srb_append.c
-srb_append_OBJECTS = srb_append.$(OBJEXT)
-srb_append_LDADD = $(LDADD)
-srb_append_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-srb_append_LDFLAGS =
-srb_read_SOURCES = srb_read.c
-srb_read_OBJECTS = srb_read.$(OBJEXT)
-srb_read_LDADD = $(LDADD)
-srb_read_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-srb_read_LDFLAGS =
-srb_write_SOURCES = srb_write.c
-srb_write_OBJECTS = srb_write.$(OBJEXT)
-srb_write_LDADD = $(LDADD)
-srb_write_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-srb_write_LDFLAGS =
-stab_SOURCES = stab.c
-stab_OBJECTS = stab.$(OBJEXT)
-stab_LDADD = $(LDADD)
-stab_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-stab_LDFLAGS =
-stream_test_SOURCES = stream_test.c
-stream_test_OBJECTS = stream_test.$(OBJEXT)
-stream_test_LDADD = $(LDADD)
-stream_test_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-stream_test_LDFLAGS =
-am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tarray.$(OBJEXT) \
-	tattr.$(OBJEXT) tconfig.$(OBJEXT) tfile.$(OBJEXT) \
-	tgenprop.$(OBJEXT) th5s.$(OBJEXT) theap.$(OBJEXT) tid.$(OBJEXT) \
-	titerate.$(OBJEXT) tmeta.$(OBJEXT) tmisc.$(OBJEXT) \
-	ttime.$(OBJEXT) trefer.$(OBJEXT) trefstr.$(OBJEXT) \
-	tselect.$(OBJEXT) tskiplist.$(OBJEXT) ttst.$(OBJEXT) \
-	tvltypes.$(OBJEXT) tvlstr.$(OBJEXT)
-testhdf5_OBJECTS = $(am_testhdf5_OBJECTS)
-testhdf5_LDADD = $(LDADD)
-testhdf5_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-testhdf5_LDFLAGS =
-testmeta_SOURCES = testmeta.c
-testmeta_OBJECTS = testmeta.$(OBJEXT)
-testmeta_LDADD = $(LDADD)
-testmeta_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-testmeta_LDFLAGS =
-am_ttsafe_OBJECTS = ttsafe.$(OBJEXT) ttsafe_dcreate.$(OBJEXT) \
-	ttsafe_error.$(OBJEXT) ttsafe_cancel.$(OBJEXT) \
-	ttsafe_acreate.$(OBJEXT)
-ttsafe_OBJECTS = $(am_ttsafe_OBJECTS)
-ttsafe_LDADD = $(LDADD)
-ttsafe_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-ttsafe_LDFLAGS =
-unlink_SOURCES = unlink.c
-unlink_OBJECTS = unlink.$(OBJEXT)
-unlink_LDADD = $(LDADD)
-unlink_DEPENDENCIES = libh5test.la $(top_builddir)/src/libhdf5.la
-unlink_LDFLAGS =
-
-DEFS = @DEFS@
-DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)/src
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
-am__depfiles_maybe = depfiles
-@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/big.Po ./$(DEPDIR)/bittests.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/btree2.Po ./$(DEPDIR)/cache.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/cmpd_dset.Po ./$(DEPDIR)/dangle.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/dsets.Po ./$(DEPDIR)/dtransform.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/dtypes.Po ./$(DEPDIR)/enum.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/err_compat.Po ./$(DEPDIR)/error_test.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/extend.Po ./$(DEPDIR)/external.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/file_handle.Po ./$(DEPDIR)/filename.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/fillval.Po ./$(DEPDIR)/flush1.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/flush2.Po ./$(DEPDIR)/getname.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/gheap.Po ./$(DEPDIR)/h5test.Plo \
-@AMDEP_TRUE@	./$(DEPDIR)/hyperslab.Po ./$(DEPDIR)/istore.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/lheap.Po ./$(DEPDIR)/links.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/mount.Po ./$(DEPDIR)/mtime.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ntypes.Po ./$(DEPDIR)/ohdr.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/reserved.Po ./$(DEPDIR)/set_extent.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/srb_append.Po ./$(DEPDIR)/srb_read.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/srb_write.Po ./$(DEPDIR)/stab.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/stream_test.Po ./$(DEPDIR)/tarray.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/tattr.Po ./$(DEPDIR)/tconfig.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/testframe.Plo ./$(DEPDIR)/testhdf5.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/testmeta.Po ./$(DEPDIR)/tfile.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/tgenprop.Po ./$(DEPDIR)/th5s.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/theap.Po ./$(DEPDIR)/tid.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/titerate.Po ./$(DEPDIR)/tmeta.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/tmisc.Po ./$(DEPDIR)/trefer.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/trefstr.Po ./$(DEPDIR)/tselect.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/tskiplist.Po ./$(DEPDIR)/ttime.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ttsafe.Po ./$(DEPDIR)/ttsafe_acreate.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ttsafe_cancel.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ttsafe_dcreate.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/ttsafe_error.Po ./$(DEPDIR)/ttst.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/tvlstr.Po ./$(DEPDIR)/tvltypes.Po \
-@AMDEP_TRUE@	./$(DEPDIR)/unlink.Po
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
-	$(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c cache.c \
-	cmpd_dset.c dangle.c dsets.c dtransform.c dtypes.c enum.c \
-	err_compat.c error_test.c extend.c external.c file_handle.c \
-	filename.c fillval.c flush1.c flush2.c getname.c gheap.c \
-	hyperslab.c istore.c lheap.c links.c mount.c mtime.c ntypes.c \
-	ohdr.c reserved.c set_extent.c srb_append.c srb_read.c \
-	srb_write.c stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c \
-	$(ttsafe_SOURCES) unlink.c
-DIST_COMMON = Makefile.am Makefile.in
-SOURCES = $(libh5test_la_SOURCES) big.c bittests.c btree2.c cache.c cmpd_dset.c dangle.c dsets.c dtransform.c dtypes.c enum.c err_compat.c error_test.c extend.c external.c file_handle.c filename.c fillval.c flush1.c flush2.c getname.c gheap.c hyperslab.c istore.c lheap.c links.c mount.c mtime.c ntypes.c ohdr.c reserved.c set_extent.c srb_append.c srb_read.c srb_write.c stab.c stream_test.c $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c
-
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/config/commence.am $(top_srcdir)/config/conclude.am $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  test/Makefile'; \
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  test/Makefile
-Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
 clean-checkLTLIBRARIES:
 	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
 	@list='$(check_LTLIBRARIES)'; for p in $$list; do \
 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test -z "$dir" && dir=.; \
+	  test "$$dir" != "$$p" || dir=.; \
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
@@ -707,7 +718,7 @@ unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES)
 	$(LINK) $(unlink_LDFLAGS) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.$(OBJEXT) core *.core
+	-rm -f *.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -778,27 +789,26 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tvltypes.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
 
-distclean-depend:
-	-rm -rf ./$(DEPDIR)
-
 .c.o:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(COMPILE) -c `cygpath -w $<`
+@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-	$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
-CCDEPMODE = @CCDEPMODE@
+@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -810,11 +820,6 @@ distclean-libtool:
 	-rm -f libtool
 uninstall-info-am:
 
-ETAGS = etags
-ETAGSFLAGS =
-
-tags: TAGS
-
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -823,6 +828,7 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
 	mkid -fID $$unique
+tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -834,8 +840,24 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '    { files[$$0] = 1; } \
 	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	    $$tags $$unique; \
+	fi
+ctags: CTAGS
+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
 
 GTAGS:
@@ -844,19 +866,22 @@ GTAGS:
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
-top_distdir = ..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	@list='$(DISTFILES)'; for file in $$list; do \
+	$(mkdir_p) $(distdir)/../config
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
 	    dir="/$$dir"; \
-	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
 	  else \
 	    dir=''; \
 	  fi; \
@@ -877,9 +902,7 @@ check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-am
 all-am: Makefile all-local
-
 installdirs:
-
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -891,7 +914,7 @@ install-am: all-am
 installcheck: installcheck-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  INSTALL_STRIP_FLAG=-s \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
 	  `test -z '$(STRIP)' || \
 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
@@ -900,7 +923,7 @@ mostlyclean-generic:
 clean-generic:
 
 distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -911,14 +934,17 @@ clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
 	clean-libtool mostlyclean-am
 
 distclean: distclean-am
-
-distclean-am: clean-am distclean-compile distclean-depend \
-	distclean-generic distclean-libtool distclean-tags
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-libtool distclean-tags
 
 dvi: dvi-am
 
 dvi-am:
 
+html: html-am
+
 info: info-am
 
 info-am:
@@ -934,7 +960,8 @@ install-man:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-
+	-rm -rf ./$(DEPDIR)
+	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-am
@@ -942,19 +969,27 @@ mostlyclean: mostlyclean-am
 mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 	mostlyclean-libtool
 
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
-.PHONY: GTAGS all all-am all-local check check-TESTS check-am clean \
-	clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
-	clean-libtool distclean distclean-compile distclean-depend \
+.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
+	clean clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
+	clean-libtool ctags distclean distclean-compile \
 	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-exec install-exec-am \
+	install-info install-info-am install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool tags uninstall \
-	uninstall-am uninstall-info-am
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am
 
 
 # Additional target for running timing test