[svn-r1515] Changes since 19990715

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

./Makefile.in		[1.3]
./examples/Makefile.in	[1.3]
./pablo/Makefile.in	[1.3]
./src/Makefile.in	[1.3]
./test/Makefile.in	[1.3]
./testpar/Makefile.in	[1.3]
./tools/Makefile.in	[1.3]
./config/commence.in	[1.3]
./config/conclude.in	[1.3]
./config/depend.in	[1.3]
	Added a `.PATH' target for Irix pmake which is identical to
	the VPATH used by most other `make' programs. Irix 6.5 (or
	6.4?) and later `make' ignores VPATH.

	Started all beginning-of-line comments with `##' instead of
	just `#' because Irix `pmake' barfs on things like the
	following because it sees the `# if' as a directive:

		# make will barf on the following line
		# if running Irix pmake


./config/commence.in	[1.3]
	Added empty definitions for optional `make' macros because
	Irix pmake complains if it sees a macro which has never been
	defined. The main body of the Makefiles can redefine these
	macros to whatever they need.

12 files changed, 350 insertions, 317 deletions

diff --git a/INSTALL b/INSTALL
index be3862e..4b4d3b8 100644
--- a/INSTALL
+++ b/INSTALL
@@ -96,6 +96,30 @@ INSTALL.ascired for instructions.
 *** Bzip'd tar archive (*.tar.bz2)
 	$ bunzip2 <hdf5-1.2.0.tar.gz |tar xf -
 
+** Source vs. Build Directories
+	On most systems the build can occur in a directory other than
+	the source directory, allowing multiple concurrent builds
+	and/or read-only source code. In order to accomplish this, one 
+	should create a build directory, cd into that directory, and
+	run the `configure' script found in the source directory
+	(configure details are below).
+
+	Unfortunately, this does not work on recent Irix platforms
+	(6.5? and later) because that `make' doesn't understand the
+	VPATH variable. However, hdf5 also supports Irix `pmake' which
+	has a .PATH target which serves a similar purpose. Here's what
+	the man pages say about VPATH, which is the facility used by
+	HDF5 makefiles for this feature:
+
+	    The VPATH facility is a derivation of the undocumented
+	    VPATH feature in the System V Release 3 version of make.
+	    System V Release 4 has a new VPATH implementation, much
+	    like the pmake(1) .PATH feature.  This new feature is also
+	    undocumented in the standard System V Release 4 manual
+	    pages.  For this reason it is not available in the IRIX
+	    version of make.  The VPATH facility should not be used
+	    with the new parallel make option.
+
 ** Configuring
 	HDF5 uses the GNU autoconf system for configuration, which
 	detects various features of the host system and creates the
diff --git a/Makefile.in b/Makefile.in
index a6079fa..c696704 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,71 +1,62 @@
-# Top-level HDF5 Makefile(.in)
-#
-# Copyright (C) 1997 National Center for Supercomputing Applications.
-#                    All rights reserved.
-#
-# 
-# This makefile mostly just reinvokes make in the various subdirectories
-# but does so in the correct order.  You can alternatively invoke make from
-# each subdirectory manually.
-#
+## Top-level HDF5 Makefile(.in)
+##
+## Copyright (C) 1997 National Center for Supercomputing Applications.
+##                    All rights reserved.
+##
+## 
+## This makefile mostly just reinvokes make in the various subdirectories
+## but does so in the correct order.  You can alternatively invoke make from
+## each subdirectory manually.
+##
 top_srcdir=@top_srcdir@
 top_builddir=.
 srcdir=@srcdir@
 VPATH=.:@srcdir@
+.PATH: . @srcdir@
 @COMMENCE@
 
 # Subdirectories in build-order (not including `examples')
 SUBDIRS=src test tools @TESTPARALLEL@
 
 ##############################################################################
-#			    T A R G E T S
-#
-# all:		Build libraries, header files, tests, and programs in the
-#		various subdirectories but does not run tests or install the
-#		library, header files, or programs.  The components can be
-#		built individually with the targets lib, progs, and tests.
-#
-# check:	Test the uninstalled library to make sure it works. You may
-#		also say `test' or `_test' (`test' doesn't work from the top
-#		level directory for some versions of make because `test' is
-#		also a directory).
-#
-# install:	Installs libraries, header files, programs, and documentation
-#		in the various directories under the prefix directory (lib,
-#		include, bin, man, info).  Use the `--prefix=PATH' option
-#		to `configure' (or `config.status') or say `--help' for
-#		other alternatives.  The default prefix is `/usr/local'.
-#
-# uninstall:	Delete all the installed files that the `install' target
-#		created (but not the noninstalled files such as `make all'
-#		created).
-#
-# clean:	Removes temporary files except those that record the
-#		configuration and those that are part of the distribution.
-#
-# mostlyclean:	Like `clean' except it doesn't delete a few files like
-#		libraries, programs, and/or generated header files because
-#		regenerating them is rarely necessary and takes a lot of time.
-#
-# distclean:	Deletes all files that are created by configuring or building
-#		HDF5.  If you have unpacked the source and built HDF5 without
-#		creating any other files, then `make distclean' will leave
-#		only the files that were in the distrubution.
-#
-# maintainer-clean:
-#		Like `distclean' except it deletes more files.  It deletes
-#		all generated files.  This target is not intended for normal
-#		users; it deletes files that may require special tools to
-#		rebuild.
-#
-# TAGS:		Updates the tags table for this program.
-#
-# dep depend:	Builds dependencies in all subdirectories.  These targets
-#		might not be available on certain combinations of make
-#		programs and C compilers.  At the other extreme, the GNU
-#		make used in combination with gcc will maintain dependency
-#		information automatically.
-#
+##		    T A R G E T S
+##
+## all:		Build libraries, header files, tests, and programs in the
+##	 	various subdirectories but does not run tests or install the
+##		library, header files, or programs.  The components can be
+##		built individually with the targets lib, progs, and tests.
+## check:	Test the uninstalled library to make sure it works. You may
+##		also say `test' or `_test' (`test' doesn't work from the top
+##		level directory for some versions of make because `test' is
+##		also a directory).
+## install:	Installs libraries, header files, programs, and documentation
+##		in the various directories under the prefix directory (lib,
+##		include, bin, man, info).  Use the `--prefix=PATH' option
+##		to `configure' (or `config.status') or say `--help' for
+##		other alternatives.  The default prefix is `/usr/local'.
+## uninstall:	Delete all the installed files that the `install' target
+##		created (but not the noninstalled files such as `make all'
+##		created).
+## clean:	Removes temporary files except those that record the
+##		configuration and those that are part of the distribution.
+## mostlyclean:	Like `clean' except it doesn't delete a few files like
+##		libraries, programs, and/or generated header files because
+##		regenerating them is rarely necessary and takes a lot of time.
+## distclean:	Deletes all files that are created by configuring or building
+##		HDF5.  If you have unpacked the source and built HDF5 without
+##		creating any other files, then `make distclean' will leave
+##		only the files that were in the distrubution.
+## maintainer-clean:
+##		Like `distclean' except it deletes more files.  It deletes
+##		all generated files.  This target is not intended for normal
+##		users; it deletes files that may require special tools to
+##		rebuild.
+## TAGS:	Updates the tags table for this program.
+## dep depend:	Builds dependencies in all subdirectories.  These targets
+##		might not be available on certain combinations of make
+##		programs and C compilers.  At the other extreme, the GNU
+##		make used in combination with gcc will maintain dependency
+##		information automatically.
 lib progs check test _test uninstall:
 	@@SETX@; for d in $(SUBDIRS); do				      \
 	   (cd $$d && $(MAKE) $@) || exit 1;				      \
@@ -82,7 +73,7 @@ install:
 	done
 	@$(LT) --mode=finish $(libdir);
 
-# Number format detection
+## Number format detection
 H5detect: 
 	(cd src && $(MAKE) $@)
 
diff --git a/README b/README
index 4054163..6bf2622 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-This is hdf5-1.3.0 currently under development
+This is hdf5-1.3.0 released on Mon Jul 19 12:58:17 CDT 1999
 Please refer to the INSTALL file for installation instructions.
 ------------------------------------------------------------------------------
 
diff --git a/config/commence.in b/config/commence.in
index 33b0d32..99d9f73 100644
--- a/config/commence.in
+++ b/config/commence.in
@@ -1,15 +1,15 @@
-#------------------------------------------------------------- -*- makefile -*-
-# The following section of this makefile comes from the
-# `./config/commence' file which was generated with config.status
-# from `./config/commence.in'.
-#------------------------------------------------------------------------------
+##------------------------------------------------------------ -*- makefile -*-
+## The following section of this makefile comes from the
+## `./config/commence' file which was generated with config.status
+## from `./config/commence.in'.
+##-----------------------------------------------------------------------------
 
-# Things that Make needs
+## Things that Make needs
 .SUFFIXES:
 .SUFFIXES: .c .o .lo
 @SET_MAKE@
 
-# Programs
+## Programs
 SHELL=/bin/sh
 CC=@CC@
 CFLAGS=@CFLAGS@
@@ -28,7 +28,7 @@ RUNPARALLEL=@RUNPARALLEL@
 RUNTEST=$(RUNSERIAL)
 TRACE=:
 
-# Installation points
+## Installation points
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@
@@ -36,7 +36,7 @@ libdir=@libdir@
 includedir=@includedir@
 PUB_LIB=$(LIB)
 
-# Shared libraries
+## Shared libraries
 LT=$(top_builddir)/libtool
 LT_COMPILE=$(LT) --mode=compile $(CC)
 LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir)
@@ -46,49 +46,60 @@ LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
 LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
 LT_UNINSTALL=$(LT) --mode=uninstall $(RM)
 
+## Optional variables. We must declare them here because Irix pmake
+## complains if it sees a reference to a variable which has never been
+## defined. The main makefile is free to redefine these to something else.
+LIB=
+LIB_SRC=
+LIB_OBJ=
+PUB_HDR=
+PROGS=
+TEST_PROGS=
+TEST_FLAGS=
+TEST_SCRIPTS=
 
-# The default is to build the library and/or programs.  We must build
-# them sequentially.
+## The default is to build the library and/or programs.  We must build
+## them sequentially.
 all:
 	$(MAKE) lib
 	$(MAKE) progs
 	$(MAKE) tests
 
-# The following rules insure that the Makefile is up-to-date by rerunning
-# various autoconf components (although not all versions of make assume
-# that the makefile is implicitly a target).  We use time stamp files to
-# keep track of the most recent update of H5config.h.in and H5config.h
-# because autoheader and config.status don't update the modification time
-# if the contents don't change.
-#
-# Graphically, the dependencies are:
-#
-#		         configure.in
-#                           |  |
-#         +-----------------+  +------------+
-#         |                                 |
-#      stamp1                           configure
-#   (H5config.h.in)                         |
-#       |  |                                |
-#       |  +---------------+    +-----------+
-#       |                  |    |
-#       |               config.status
-#       |                     |
-#       |  +------------------+
-#       |  |
-#      stamp2
-#    (H5config.h)                   Makefile.in et al
-#         |                                 |
-#         +------------------+  +-----------+
-#                            |  |
-#                          Makefile
-#
-# A side effect of updating stamp1 is to generate H5config.h.in and a
-# side effect of updating stamp2 is to generate H5config.h.  When using
-# a version of make that doesn't treat the makefile as the initial target
-# the user may want to occassionally type `make Makefile' in any source
-# directory.
-#
+## The following rules insure that the Makefile is up-to-date by rerunning
+## various autoconf components (although not all versions of make assume
+## that the makefile is implicitly a target).  We use time stamp files to
+## keep track of the most recent update of H5config.h.in and H5config.h
+## because autoheader and config.status don't update the modification time
+## if the contents don't change.
+##
+## Graphically, the dependencies are:
+##
+##		         configure.in
+##                           |  |
+##         +-----------------+  +------------+
+##         |                                 |
+##      stamp1                           configure
+##   (H5config.h.in)                         |
+##       |  |                                |
+##       |  +---------------+    +-----------+
+##       |                  |    |
+##       |               config.status
+##       |                     |
+##       |  +------------------+
+##       |  |
+##      stamp2
+##    (H5config.h)                   Makefile.in et al
+##         |                                 |
+##         +------------------+  +-----------+
+##                            |  |
+##                          Makefile
+##
+## A side effect of updating stamp1 is to generate H5config.h.in and a
+## side effect of updating stamp2 is to generate H5config.h.  When using
+## a version of make that doesn't treat the makefile as the initial target
+## the user may want to occassionally type `make Makefile' in any source
+## directory.
+##
 STAMP1=$(top_builddir)/config/stamp1
 STAMP2=$(top_builddir)/config/stamp2
 
@@ -115,7 +126,8 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(STAMP1)
 Makefile: $(MAKEFILE_PARTS) $(STAMP2)
 	-cd $(top_builddir); CONFIG_HEADERS= ./config.status
 
-#------------------------------------------------------------------------------
-# The following section of this makefile comes from the middle of `Makefile.in'
-# from this directory.  It was generated by running `config.status'.
-#------------------------------------------------------------------------------
+##-----------------------------------------------------------------------------
+## The following section of this makefile comes from the middle of
+## `Makefile.in' from this directory.  It was generated by running
+## `config.status'.
+##-----------------------------------------------------------------------------
diff --git a/config/conclude.in b/config/conclude.in
index 8e47c9e..b3ec16b 100644
--- a/config/conclude.in
+++ b/config/conclude.in
@@ -1,24 +1,24 @@
-#------------------------------------------------------------- -*- makefile -*-
-# The following section of this makefile comes from the
-# `./config/conclude' file which was generated with config.status
-# from `./config/conclude.in'.
-#------------------------------------------------------------------------------
-
-# This is the target for the library described in the main body of the
-# makefile.
-#
+##------------------------------------------------------------ -*- makefile -*-
+## The following section of this makefile comes from the
+## `./config/conclude' file which was generated with config.status
+## from `./config/conclude.in'.
+##-----------------------------------------------------------------------------
+
+## This is the target for the library described in the main body of the
+## makefile.
+##
 lib: $(LIB)
 $(LIB) __no_library__: $(LIB_OBJ)
 	@$(LT_LINK_LIB) -o $@ $(CFLAGS) $(LIB_OBJ) $(LIBS)
 
 progs: $(LIB) $(PROGS)
 
-# Build a tags file in this directory.
+## Build a tags file in this directory.
 TAGS: $(LIB_SRC)
 	$(RM) $@
 	-etags $(LIB_SRC)
 
-# Runs each test in order, passing $(TEST_FLAGS) to the program.
+## Runs each test in order, passing $(TEST_FLAGS) to the program.
 tests: $(TEST_PROGS) $(LIB)
 check test _test: tests
 	@for test in $(TEST_PROGS) dummy; do                                  \
@@ -45,7 +45,7 @@ check test _test: tests
 	   fi;								      \
 	done;
 
-# Make installation directories directories if they don't exist.
+## Make installation directories directories if they don't exist.
 $(libdir):
 	mkdir $@ && chmod 755 $@
 
@@ -55,7 +55,7 @@ $(includedir):
 $(bindir):
 	mkdir $@ && chmod 755 $@
 
-# Install the library, the public header files, and programs.
+## Install the library, the public header files, and programs.
 install: $(PUB_LIB) $(PUB_HDR) $(PROGS) $(libdir) $(includedir) $(bindir)
 	@for f in X $(PUB_LIB); do					      \
 	   if test $$f != X; then					      \
@@ -81,7 +81,7 @@ install: $(PUB_LIB) $(PUB_HDR) $(PROGS) $(libdir) $(includedir) $(bindir)
 	   fi;							              \
 	done
 
-# Removes those things that `make install' (would have) installed.
+## Removes those things that `make install' (would have) installed.
 uninstall:
 	@if test "X$(LIB)" != X; then					      \
 	   for f in $(LIB); do						      \
@@ -97,27 +97,27 @@ uninstall:
 	   done;							      \
 	fi
 
-# Removes temporary files without removing the final target files.  That is,
-# remove things like object files but not libraries or executables.
-#
+## Removes temporary files without removing the final target files.  That is,
+## remove things like object files but not libraries or executables.
+##
 mostlyclean:
 	-$(RM) $(LIB_OBJ) $(LIB_OBJ:.lo=.o)
 	-$(RM) $(TEST_OBJ) $(TEST_OBJ:.lo=.o)
 	-$(RM) $(PROG_OBJ) $(PROG_OBJ:.lo=.o) $(MOSTLYCLEAN)
 
-# Like `mostlyclean' except it also removes the final targets: things like
-# libraries and executables.  This target doesn't remove any file that
-# is part of the HDF5 distribution.
-#
+## Like `mostlyclean' except it also removes the final targets: things like
+## libraries and executables.  This target doesn't remove any file that
+## is part of the HDF5 distribution.
+##
 clean: mostlyclean
 	-$(RM) $(LIB) $(TEST_PROGS) $(PROGS) $(CLEAN)
 	-$(RM) -r .libs
 
-# Like `clean' except it also removes files that were created by running
-# configure.  If you've unpacked the source and built HDF5 without creating
-# any other files, then `make distclean' will leave only the files that were
-# in the distribution.
-#
+## Like `clean' except it also removes files that were created by running
+## configure.  If you've unpacked the source and built HDF5 without creating
+## any other files, then `make distclean' will leave only the files that were
+## in the distribution.
+##
 distclean: clean
 	-$(RM) .depend TAGS *~ core *.core *.bak *.old *.new $(DISTCLEAN)
 	@if test -f $(srcdir)/Makefile.in; then				      \
@@ -125,28 +125,28 @@ distclean: clean
 	fi
 
 
-# Like `distclean' except it deletes all files that can be regenerated from
-# the makefile, including those generated from autoheader and autoconf.
-#
+## Like `distclean' except it deletes all files that can be regenerated from
+## the makefile, including those generated from autoheader and autoconf.
+##
 maintainer-clean: distclean
 	-$(RM) *~ core core.* *.core *.bak *.contrib gmon.out
 
-# Implicit rules
+## Implicit rules
 .c.o:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 
 .c.lo:
 	@$(LT_COMPILE) $(CFLAGS) $(CPPFLAGS) -c $<
 
-#------------------------------------------------------------------------------
-# The following section of this makefile contains dependencies between the
-# source files and the header files.  If GNU make and GCC are being used then
-# the dependencies are in the form of rules that cause the information to
-# be kept updated automatically.  Otherwise the dependencies are listed
-# explicitly and come from the `.distdep' files in the various directories.
-# These files are part of the distribution and are generated automatically on
-# GNU/GCC systems.
-#------------------------------------------------------------------------------
+##-----------------------------------------------------------------------------
+## The following section of this makefile contains dependencies between the
+## source files and the header files.  If GNU make and GCC are being used then
+## the dependencies are in the form of rules that cause the information to
+## be kept updated automatically.  Otherwise the dependencies are listed
+## explicitly and come from the `.distdep' files in the various directories.
+## These files are part of the distribution and are generated automatically on
+## GNU/GCC systems.
+##-----------------------------------------------------------------------------
 
 @DEPEND1@
 @DEPEND2@
diff --git a/config/depend.in b/config/depend.in
index a02ad20..6915524 100644
--- a/config/depend.in
+++ b/config/depend.in
@@ -1,25 +1,25 @@
-#                                                              -*- makefile -*-
+##                                                             -*- makefile -*-
 
-# We keep a list of dependencies in `.depend' for each of the source
-# files on which it depends.  When one of the source files is modified
-# we remove its record from .depend and regenerate its dependencies,
-# tacking them onto the end of .depend.  By including the .depend file
-# into the makefile, we're telling make that the makefile depends on
-# the dependency list in the .depend file.
-#
-# This is as fast as the `.d' method described in the GNU make manual
-# for automatic dependencies, but has the added advantage that all
-# dependencies are stored in one place.  The advantage over the
-# `makedepend' program is that only those files that are out of date
-# have dependency information rebuilt, and the Makefile is not
-# modified.
-#
-# This is also where tracing information is updated.  The $(TRACE)
-# program is run on each source file to make sure that the H5TRACE()
-# macros are up to date.  If they are then the file is not modified,
-# otherwise the file is changed and a backup is saved by appending a
-# tilde to the file name.
-#
+## We keep a list of dependencies in `.depend' for each of the source
+## files on which it depends.  When one of the source files is modified
+## we remove its record from .depend and regenerate its dependencies,
+## tacking them onto the end of .depend.  By including the .depend file
+## into the makefile, we're telling make that the makefile depends on
+## the dependency list in the .depend file.
+##
+## This is as fast as the `.d' method described in the GNU make manual
+## for automatic dependencies, but has the added advantage that all
+## dependencies are stored in one place.  The advantage over the
+## `makedepend' program is that only those files that are out of date
+## have dependency information rebuilt, and the Makefile is not
+## modified.
+##
+## This is also where tracing information is updated.  The $(TRACE)
+## program is run on each source file to make sure that the H5TRACE()
+## macros are up to date.  If they are then the file is not modified,
+## otherwise the file is changed and a backup is saved by appending a
+## tilde to the file name.
+##
 .PRECIOUS: .depend .distdep
 dep depend: .distdep
 
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 04ff350..e77bd7a 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -1,38 +1,39 @@
-# HDF5 Library Examples Makefile(.in)
-#
-# Copyright (C) 1997 National Center for Supercomputing Applications.
-#                    All rights reserved.
-#
+## HDF5 Library Examples Makefile(.in)
+##
+## Copyright (C) 1997 National Center for Supercomputing Applications.
+##                    All rights reserved.
+##
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
+.PATH: . @srcdir@
 @COMMENCE@
 
-# Add include directory to the C preprocessor flags and the hdf5 library
-# to the library list.
+## Add include directory to the C preprocessor flags and the hdf5 library
+## to the library list.
 CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@
 LIBHDF5=../src/libhdf5.la
 
-# These are the programs that `make all' or `make tests' will build and which
-# `make check' will run. List them in the order they should be run.
+## These are the programs that `make all' or `make tests' will build and which
+## `make check' will run. List them in the order they should be run.
 TEST_PROGS= h5_write h5_read h5_extend_write h5_chunk_read h5_compound \
 	h5_group h5_select h5_attribute h5_mount h5_reference
 
-# These are the files that `make clean' (and derivatives) will remove from
-# this directory.
+## These are the files that `make clean' (and derivatives) will remove from
+## this directory.
 CLEAN=*.h5
 
-# List all source files here.  The list of object files will be
-# created by replacing the `.c' with a `.o'.  This list is necessary
-# for building automatic dependencies.
+## List all source files here.  The list of object files will be
+## created by replacing the `.c' with a `.o'.  This list is necessary
+## for building automatic dependencies.
 TEST_SRC=h5_chunk_read.c h5_compound.c h5_extend_write.c h5_group.c \
 	 h5_read.c h5_write.c h5_select.c h5_attribute.c h5_mount.c \
 	 h5_reference.c
 TEST_OBJ=$(TEST_SRC:.c=.lo)
 
 
-# How to build the programs... they all depend on the hdf5 library
+## How to build the programs... they all depend on the hdf5 library
 $(TEST_PROGS): $(LIBHDF5)
 h5_chunk_read: h5_chunk_read.lo
 	@$(LT_LINK_EXE) $(CFLAGS) -o $@ h5_chunk_read.lo $(LIBHDF5) $(LDFLAGS) $(LIBS)
diff --git a/pablo/Makefile.in b/pablo/Makefile.in
index 1a77d83..d5df455 100644
--- a/pablo/Makefile.in
+++ b/pablo/Makefile.in
@@ -1,33 +1,34 @@
-# HDF5 Library Makefile(.in)
-#
-# Copyright (C) 1997 National Center for Supercomputing Applications.
-#                    All rights reserved.
-#
-# 
+## HDF5 Library Makefile(.in)
+##
+## Copyright (C) 1997 National Center for Supercomputing Applications.
+##                    All rights reserved.
+##
+## 
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
+.PATH: . @srcdir@
 @COMMENCE@
 TRACE=perl ../bin/trace
 ###############################################################################
-# *** MODIFICATONS FOR CREATING THE PABLO INSTRUMENTED LIBRARY libhdf5-inst.a #
-# For Pablo instrumenation of parallel code, remove the # from in front of    #
-# PABLO_MPIO_FLAGS.  							      #
-# Set PABLO_INC equal to the path of the include directory for the Pablo      #
-# TraceLibrary								      #
+## MODIFICATONS FOR CREATING THE PABLO INSTRUMENTED LIBRARY libhdf5-inst.a
+## For Pablo instrumenation of parallel code, remove the # from in front of
+## PABLO_MPIO_FLAGS.
+## Set PABLO_INC equal to the path of the include directory for the Pablo
+## TraceLibrary
 ###############################################################################
-#PABLO_MPIO_FLAGS = -DHAVE_PARALLEL -DHAVE_MPIOTRACE	
+##PABLO_MPIO_FLAGS = -DHAVE_PARALLEL -DHAVE_MPIOTRACE	
 PABLO_INC = 
 PABLO_FLAGS = -I$(PABLO_INC) -DHAVE_PABLO $(PABLO_MPIO_FLAGS)
 
-# Add `-I.' to the C preprocessor flags.
+## Add `-I.' to the C preprocessor flags.
 CPPFLAGS=-I. -I../src $(PABLO_FLAGS) @CPPFLAGS@
 
-# This is our main target:
+## This is our main target:
 LIB=libhdf5-inst.a
 
-# Source and object files for the library (lexicographically)...
+## Source and object files for the library (lexicographically)...
 LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c \
     H5Ffamily.c H5Fistore.c H5Flow.c H5Fmpio.c H5Fsec2.c H5Fsplit.c \
     H5Fstdio.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5I.c H5MF.c \
@@ -39,61 +40,61 @@ LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c \
 
 LIB_OBJ=$(LIB_SRC:.c=.o)
 
-# Temporary files
+## Temporary files
 MOSTLYCLEAN=H5detect.o H5detect H5Tinit.o H5Tinit.c
 
-# Pablo header files (to be installed)...
+## Pablo header files (to be installed)...
 PABLO_HDR = HDFentryNames.h HDFidList.h ProcIDs.h HDFTrace.h ProcTrace.h \
             ProcTrace.inc
 
-# Public header files ...
+## Public header files ...
 PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Dpublic.h \
     H5Epublic.h H5Fpublic.h H5Gpublic.h H5HGpublic.h H5HLpublic.h \
     H5Ipublic.h H5MFpublic.h H5MMpublic.h H5Opublic.h H5Ppublic.h \
     H5Rpublic.h H5RApublic.h H5Spublic.h H5Tpublic.h H5Zpublic.h H5config.h \
     hdf5.h
 
-# Other header files (not to be installed)...
+## Other header files (not to be installed)...
 PRIVATE_HDR=H5private.h H5Aprivate.h H5Apkg.h H5ACprivate.h H5Bprivate.h \
     H5Dprivate.h H5Eprivate.h H5Fprivate.h H5Gprivate.h H5Gpkg.h \
     H5HGprivate.h H5HLprivate.h H5Iprivate.h H5MFprivate.h H5MMprivate.h \
     H5Oprivate.h H5Pprivate.h H5Rprivate.h H5RAprivate.h H5Sprivate.h \
     H5Tprivate.h H5TBprivate.h H5Tpkg.h H5Vprivate.h H5Zprivate.h
 
-# Number format detection
+## Number format detection
 H5Tinit.c: ../src/H5Tinit.c
 	cp ../src/H5Tinit.c .
 
-#------------------------------------------------------------- -*- makefile -*-
-# The following section of this makefile comes from the
-# `./config/conclude' file which was generated with config.status
-# from `./config/conclude.in'.
-#------------------------------------------------------------------------------
+##------------------------------------------------------------ -*- makefile -*-
+## The following section of this makefile comes from the
+## `./config/conclude' file which was generated with config.status
+## from `./config/conclude.in'.
+##-----------------------------------------------------------------------------
 
-# This is the target for the library described in the main body of the
-# makefile.
-#
+## This is the target for the library described in the main body of the
+## makefile.
+##
 lib: $(LIB)
 $(LIB) __no_library__: $(LIB_OBJ)
 	$(AR) -rc $@ $(LIB_OBJ)
 	$(RANLIB) $@
 
-#
-# Dummy this out so that there is no redundant make of the library
-#
+##
+## Dummy this out so that there is no redundant make of the library
+##
 progs: 
 
-# Build a tags file in this directory.
+## Build a tags file in this directory.
 TAGS: $(LIB_SRC)
 	$(RM) $@
 	-etags $(LIB_SRC)
 
-#
-# Dummy this out so that there is no redundant make of the library
-#
+##
+## Dummy this out so that there is no redundant make of the library
+##
 tests: 
 
-# Install the library, the public header files, and programs.
+## Install the library, the public header files, and programs.
 install: $(LIB) 
 	@test -d $(libdir) || mkdir $(libdir)
 	@for f in X $(LIB); do						      \
@@ -108,42 +109,42 @@ install: $(LIB)
 	    fi                                                                \
 	done
 
-# Removes those things that `make install' (would have) installed.
+## Removes those things that `make install' (would have) installed.
 uninstall:
 	@if test "X$(LIB)" != X; then					      \
            set -x; cd $(libdir) && $(RM) $(LIB);			      \
 	fi
-# Removes temporary files without removing the final target files.  That is,
-# remove things like object files but not libraries or executables.
-#
+## Removes temporary files without removing the final target files.  That is,
+## remove things like object files but not libraries or executables.
+##
 mostlyclean:
 	$(RM) $(LIB_OBJ) $(TEST_OBJ) $(PROG_OBJ) $(MOSTLYCLEAN)
 
-# Like `mostlyclean' except it also removes the final targets: things like
-# libraries and executables.  This target doesn't remove any file that
-# is part of the HDF5 distribution.
-#
+## Like `mostlyclean' except it also removes the final targets: things like
+## libraries and executables.  This target doesn't remove any file that
+## is part of the HDF5 distribution.
+##
 clean: mostlyclean
 	$(RM) $(LIB) $(TESTS) $(PROGS) $(CLEAN) $(PABLO_CLEAN)
 
-# Like `clean' except it also removes files that were created by running
-# configure.  If you've unpacked the source and built HDF5 without creating
-# any other files, then `make distclean' will leave only the files that were
-# in the distribution.
-#
+## Like `clean' except it also removes files that were created by running
+## configure.  If you've unpacked the source and built HDF5 without creating
+## any other files, then `make distclean' will leave only the files that were
+## in the distribution.
+##
 distclean: clean
 	$(RM) .depend TAGS *~ core *.core *.bak *.old *.new $(DISTCLEAN)
 	@if test -f $(srcdir)/Makefile.in; then				      \
 	   (set -x; $(RM) Makefile);					      \
 	fi
 
-# Like `distclean' except it deletes all files that can be regenerated from
-# the makefile, including those generated from autoheader and autoconf.
-#
+## Like `distclean' except it deletes all files that can be regenerated from
+## the makefile, including those generated from autoheader and autoconf.
+##
 maintainer-clean: distclean
 	$(RM) *~ core core.* *.core *.bak *.contrib gmon.out
 
-# Implicit rules
+## Implicit rules
 .c.a:
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
 	$(AR) -rc $@ $*.o
@@ -197,15 +198,15 @@ PabloHDF_RT.o: PabloHDF_RT.c $(PABLO_INCLUDES)
 
 PabloHDF_SDDF.o: PabloHDF_SDDF.c $(PABLO_INCLUDES)
 	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-#------------------------------------------------------------------------------
-# The following section of this makefile contains dependencies between the
-# source files and the header files.  If GNU make and GCC are being used then
-# the dependencies are in the form of rules that cause the information to
-# be kept updated automatically.  Otherwise the dependencies are listed
-# explicitly and come from the `.distdep' files in the various directories.
-# These files are part of the distribution and are generated automatically on
-# GNU/GCC systems.
-#------------------------------------------------------------------------------
+##-----------------------------------------------------------------------------
+## The following section of this makefile contains dependencies between the
+## source files and the header files.  If GNU make and GCC are being used then
+## the dependencies are in the form of rules that cause the information to
+## be kept updated automatically.  Otherwise the dependencies are listed
+## explicitly and come from the `.distdep' files in the various directories.
+## These files are part of the distribution and are generated automatically on
+## GNU/GCC systems.
+##-----------------------------------------------------------------------------
 
 H5A.c: ../src/H5A.c 
 H5A.o: \
diff --git a/src/Makefile.in b/src/Makefile.in
index 8b8c9bc..8c1b288 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,24 +1,25 @@
-# HDF5 Library Makefile(.in)
-#
-# Copyright (C) 1997 National Center for Supercomputing Applications.
-#                    All rights reserved.
-#
-# 
+## HDF5 Library Makefile(.in)
+##
+## Copyright (C) 1997 National Center for Supercomputing Applications.
+##                    All rights reserved.
+##
+## 
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
+.PATH: . @srcdir@
 @COMMENCE@
 
 TRACE=perl $(top_srcdir)/bin/trace
 
-# Add `-I.' to the C preprocessor flags.
+## Add `-I.' to the C preprocessor flags.
 CPPFLAGS=-I. -I@srcdir@ @CPPFLAGS@
 
-# This is our main target:
+## This is our main target:
 LIB=libhdf5.la
 
-# Source and object files for the library (lexicographically)...
+## Source and object files for the library (lexicographically)...
 LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c \
     H5Ffamily.c H5Fistore.c H5Flow.c H5Fmpio.c H5Fsec2.c H5Fsplit.c \
     H5Fstdio.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c H5I.c H5MF.c \
@@ -30,28 +31,28 @@ LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcore.c \
 
 LIB_OBJ=$(LIB_SRC:.c=.lo)
 
-# Temporary files
+## Temporary files
 MOSTLYCLEAN=H5detect.o H5detect H5Tinit.o H5Tinit.c
 
-# Public header files (to be installed)...
+## Public header files (to be installed)...
 PUB_HDR=H5public.h H5Apublic.h H5ACpublic.h H5Bpublic.h H5Dpublic.h \
     H5Epublic.h H5Fpublic.h H5Gpublic.h H5HGpublic.h H5HLpublic.h \
     H5Ipublic.h H5MFpublic.h H5MMpublic.h H5Opublic.h H5Ppublic.h \
     H5Rpublic.h H5RApublic.h H5Spublic.h H5Tpublic.h H5Zpublic.h H5config.h \
     hdf5.h H5api_adpt.h
 
-# Other header files (not to be installed)...
+## Other header files (not to be installed)...
 PRIVATE_HDR=H5private.h H5Aprivate.h H5Apkg.h H5ACprivate.h H5Bprivate.h \
     H5Dprivate.h H5Eprivate.h H5Fprivate.h H5Gprivate.h H5Gpkg.h \
     H5HGprivate.h H5HLprivate.h H5Iprivate.h H5MFprivate.h H5MMprivate.h \
     H5Oprivate.h H5Pprivate.h H5Rprivate.h H5RAprivate.h H5Sprivate.h \
     H5Tprivate.h H5TBprivate.h H5Tpkg.h H5Vprivate.h H5Zprivate.h
 
-# Number format detection
+## Number format detection
 H5Tinit.c: H5detect
 	$(RUNSERIAL) ./H5detect >H5Tinit.c
 
-# no $(LIB) in the action below since that's being made now.
+## no $(LIB) in the action below since that's being made now.
 H5detect: H5detect.o
 	$(CC) $(CFLAGS) -o $@ H5detect.o $(LDFLAGS) $(LIBS)
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 20b699b..7ad9478 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,30 +1,31 @@
-# HDF5 Library Test Makefile(.in)
-#
-# Copyright (C) 1997 National Center for Supercomputing Applications.
-#                    All rights reserved.
-#
-# 
+## HDF5 Library Test Makefile(.in)
+##
+## Copyright (C) 1997 National Center for Supercomputing Applications.
+##                    All rights reserved.
+##
+## 
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
+.PATH: . @srcdir@
 @COMMENCE@
 
-# Add include directory to the C preprocessor flags and the h5test and hdf5
-# libraries to the library list.
+## Add include directory to the C preprocessor flags and the h5test and hdf5
+## libraries to the library list.
 CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@
 
-# These are our main targets. They should be listed in the order to be
-# executed, generally most specific tests to least specific tests.
+## These are our main targets. They should be listed in the order to be
+## executed, generally most specific tests to least specific tests.
 RUNTEST=$(LT_RUN)
 TEST_PROGS=testhdf5 lheap ohdr stab gheap hyperslab istore bittests dtypes   \
       dsets cmpd_dset extend external links unlink big mtime fillval mount   \
       flush1 flush2 enum
 TIMINGS=iopipe chunk ragged overhead
 
-# The libh5test.a library provides common support code for the tests. We link
-# this library statically because some systems can only link executables to
-# a single shared library and libhdf5 is much bigger than libh5test.
+## The libh5test.a library provides common support code for the tests. We link
+## this library statically because some systems can only link executables to
+## a single shared library and libhdf5 is much bigger than libh5test.
 LT_LINK_LIB=$(LT) --mode=link $(CC) -static -rpath $(libdir)
 LIBHDF5=../src/libhdf5.la
 LIB=libh5test.la
@@ -32,11 +33,11 @@ LIB_SRC=h5test.c
 LIB_OBJ=$(LIB_SRC:.c=.lo)
 PUB_LIB=
 
-# Temporary files.  These files are the ones created by setting the
-# HDF5_NOCLEANUP environment variable and running `make test' without
-# specifying a file prefix or low-level driver.  Changing the file
-# prefix or low-level driver with environment variables will influence 
-# the temporary file name in ways that the makefile is not aware of.
+## Temporary files.  These files are the ones created by setting the
+## HDF5_NOCLEANUP environment variable and running `make test' without
+## specifying a file prefix or low-level driver.  Changing the file
+## prefix or low-level driver with environment variables will influence 
+## the temporary file name in ways that the makefile is not aware of.
 MOSTLYCLEAN=cmpd_dset.h5 dataset.h5 extend.h5 istore.h5 tfile1.h5 tfile2.h5  \
 	    tfile3.h5 th5s1.h5 lheap.h5 ohdr.h5 stab1.h5 stab2.h5            \
 	    extern_1.h5 extern_2.h5 extern_3.h5 extern_1a.raw extern_1b.raw  \
@@ -49,10 +50,10 @@ MOSTLYCLEAN=cmpd_dset.h5 dataset.h5 extend.h5 istore.h5 tfile1.h5 tfile2.h5  \
 	    flush.h5 enum1.h5
 CLEAN=$(TIMINGS)
 
-# Source and object files for programs...  The TEST_SRC list contains all the
-# source files and is used for things like dependencies, archiving, etc.  The
-# other source lists are for the individual tests, the files of which may
-# overlap with other tests.
+## Source and object files for programs...  The TEST_SRC list contains all the
+## source files and is used for things like dependencies, archiving, etc.  The
+## other source lists are for the individual tests, the files of which may
+## overlap with other tests.
 TEST_SRC=big.c bittests.c chunk.c cmpd_dset.c dsets.c dtypes.c extend.c  \
      external.c fillval.c flush1.c flush2.c gheap.c h5test.c hyperslab.c \
      iopipe.c istore.c lheap.c links.c mount.c mtime.c ohdr.c overhead.c \
@@ -60,10 +61,10 @@ TEST_SRC=big.c bittests.c chunk.c cmpd_dset.c dsets.c dtypes.c extend.c  \
 	 tselect.c tvltypes.c unlink.c enum.c
 TEST_OBJ=$(TEST_SRC:.c=.lo)
 
-# Private header files (not to be installed)...
+## Private header files (not to be installed)...
 PRIVATE_HDR=testhdf5.h
 
-# Additional targets
+## Additional targets
 .PHONY: timings _timings
 timings _timings: $(TIMINGS)
 	@for timing in $(TIMINGS) dummy; do				      \
@@ -73,7 +74,7 @@ timings _timings: $(TIMINGS)
 	   fi;								      \
 	done;
 
-# How to build the tests...  They all depend on the test and hdf5 libraries.
+## How to build the tests...  They all depend on the test and hdf5 libraries.
 $(TEST_PROGS): $(LIB) $(LIBHDF5)
 TESTHDF5_OBJ=testhdf5.lo tattr.lo tfile.lo tmeta.lo trefer.lo tselect.lo tvltypes.lo th5s.lo
 testhdf5: $(TESTHDF5_OBJ)
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index 624e5f9..fdb47a6 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -1,36 +1,37 @@
-# hdf5 Parallel Library Test Makefile(.in)
-#
-# Copyright (C) 1998 National Center for Supercomputing Applications
-#                    All rights reserved
-#
-#
+## hdf5 Parallel Library Test Makefile(.in)
+##
+## Copyright (C) 1998 National Center for Supercomputing Applications
+##                    All rights reserved
+##
+##
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
+.PATH: . @srcdir@
 @COMMENCE@
 
-# Add the include directory to the C preprocessor flags the the hdf5 library
-# to the library list.
+## Add the include directory to the C preprocessor flags the the hdf5 library
+## to the library list.
 CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@
 LIBHDF5=../src/libhdf5.la
 
-# These tests are parallel
+## These tests are parallel
 RUNTEST=$(RUNPARALLEL)
 
-# These are our main targets
+## These are our main targets
 TEST_PROGS=testphdf5
 
-# Temporary files
+## Temporary files
 MOSTLYCLEAN=ParaEg[123].h5f
 DISTCLEAN=go
 
-# Test source files
+## Test source files
 TEST_SRC=testphdf5.c t_dset.c t_file.c t_mpi.c
 TEST_OBJ=$(TEST_SRC:.c=.lo)
 TEST_HDR=testphdf5.h
 
-# How to build the tests... They all depend on the hdf5 library
+## How to build the tests... They all depend on the hdf5 library
 $(TEST_PROGS): ../src/libhdf5.la
 
 testphdf5: $(TEST_OBJ)
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 6dab9e9..dfc6c9f 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,51 +1,52 @@
-# HDF5 Library Makefile(.in)
-#
-# Copyright (C) 1997 National Center for Supercomputing Applications.
-#                    All rights reserved.
-#
-# 
+## HDF5 Library Makefile(.in)
+##
+## Copyright (C) 1997 National Center for Supercomputing Applications.
+##                    All rights reserved.
+##
+## 
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
+.PATH: . @srcdir@
 @COMMENCE@
 
-# Add include directory to the C preprocessor flags, add -lh5tools and
-# -lhdf5 to the list of libraries.
+## Add include directory to the C preprocessor flags, add -lh5tools and
+## -lhdf5 to the list of libraries.
 CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@
 
-# Test programs and scripts.
+## Test programs and scripts.
 TEST_PROGS=
 TEST_SCRIPTS=$(srcdir)/testh5dump.sh @TESTH5TOH4@
 
-# These are our main targets: library and tools. We link this library
-# statically because some systems can only link executables to a single
-# shared library and libhdf5 is much bigger than libh5tools.
+## These are our main targets: library and tools. We link this library
+## statically because some systems can only link executables to a single
+## shared library and libhdf5 is much bigger than libh5tools.
 LT_LINK_LIB=$(LT) --mode=link $(CC) -static -rpath $(libdir)
 LIB=libh5tools.la
 LIBHDF5=../src/libhdf5.la
 PROGS=h5debug h5import h5ls h5repart h5dump h5dumptst @H5TOH4@
 
-# Source and object files for the library; do not install
+## Source and object files for the library; do not install
 LIB_SRC=h5tools.c h5findshd.c
 LIB_OBJ=$(LIB_SRC:.c=.lo)
 PUB_LIB=
 
-# Source and object files for programs...
+## Source and object files for programs...
 PROG_SRC=h5debug.c h5import.c h5ls.c h5repart.c h5dump.c h5dumputil.c \
 	h5toh4.c h5dumptst.c
 PROG_OBJ=$(PROG_SRC:.c=.lo)
 PRIVATE_HDR=h5tools.h
 
-# Source and object files for the tests
+## Source and object files for the tests
 TEST_SRC=
 TEST_OBJ=$(TEST_SRC:.c=.lo)
 
-# Programs have to be built before they can be tested!
+## Programs have to be built before they can be tested!
 check test _test: $(PROGS)
 
-# How to build the programs... They all depend on the hdf5 library and
-# the tools library compiled in this directory.
+## How to build the programs... They all depend on the hdf5 library and
+## the tools library compiled in this directory.
 $(PROGS): $(LIB) ../src/libhdf5.la
 
 h5debug: h5debug.lo