[svn-r1112] Changes since 19990301

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

./INSTALL
	Reorganized and added some additional examples.

./MANIFEST
./aclocal.m4			[NEW]
./configure.in
./configure			[REGENERATED]
./src/H5config.h.in		[REGENERATED]
./bin/ltconfig			[NEW]
./bin/ltmain.sh			[NEW]
	Added tests to determine how to compile shared libraries and
	how to link programs with them before the libraries are
	installed.  Also how to install and uninstall shared
	libraries. The configure step also prints the names of the
	config files it's trying to load for easier debugging.

./bin/config.guess
./bin/config.sub
	Replaced with a newer version from GNU.  The changes we made
	to that file to report `irix6.x' and `FreeBSD' without version
	numbers have been incorporated into configure.in instead.  In
	the future, do not change these two files (see the top of
	configure.in instead). By the way, this update was required to
	get shared libraries working.

./config/linux			[REMOVED]
./config/linux-gnulibc1		[NEW]
./config/linux-gnu		[NEW]
./config/alpha-dec		[REMOVED]
./config/alpha-dec-osf4.0	[REMOVED]
./config/dec-osf4.x		[NEW]
./config/irix5.3		[REMOVED]
./config/irix5.x		[NEW]
./config/irix64			[REMOVED]
./config/freebsd
	Moved config files around to agree with output from the new
	config.guess.  The linux file was split into gnu (RedHat),
	gnulibc1, and gnulibc2 versions. The alpha-dec file was
	removed (I think it was unused) and the alpha-dec-osf4.0 was
	changed to dec-osf4.x. The irix5.3 file renamed to irix5.x and
	the irix64 file was renamed to irix6.x. The freebsd file was
	changed to point to linux-gnulibc1. These changes were tested
	on:

		Linux 2.0
		Linux 2.1
		FreeBSD 3.2
		Irix 5.3
		Irix64 6.2
		Irix64 6.4
		HP/UX 10.20
		OSF1 4.0

./config/alphaev56-dec-osf4.x
./config/irix64
	Added warnings similar to linux/freebsd about using compilers
	with known bugs.

./config/commence.in
./config/conclude.in
./src/Makefile.in
./test/Makefile.in
./testpar/Makefile.in
./tools/Makefile.in
	Added definitions for shared libraries. This has been tested
	on the following systems:

		Linux 2.0
		Linux 2.1
		FreeBSD 3.2
		Irix 5.3
		Irix64 6.2
		Irix64 6.4
		HP/UX 10.20		static only
		OSF1 4.0

	If you want to disable use of shared libraries (you probably
	do for development purposes since it takes a lot longer to
	compile and because you have to run dynamically linked
	programs in a special way if the library hasn't been
	installed) then add `--disable-shared' to the configure
	command line.  This is all documented in the INSTALL file.

./bin/release
	Temprarily commented out the MANIFEST checking when running
	under svf since svf is about to be replaced by a newer
	version.  This change only affects error checking during the
	release process.

./Makefile.dist
./Makefile.in
	Added `make check' which does the same thing as `make _test'
	since the former is endorsed by the GNU coding style and
	people are used to it.  The old `make _test' still works too
	(and so does `make test' if you use GNU make).

1 files changed, 15 insertions, 12 deletions

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 48061ca..1c75c00 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -6,16 +6,19 @@
 # 
 @COMMENCE@
 
-# Add include directory to the C preprocessor flags, add the -lh5tools to the
-# libraries.
+# 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.a libh5tools.a @LIBS@
+LIBS=../src/libhdf5.la @LIBS@
 
 # Test programs and scripts.
 TEST_PROGS=
 TEST_SCRIPTS=testh5dump.sh @TESTH5TOH4@
 
-# These are our main targets: library and tools.
+# These are our main targets: library and tools. We link this library
+# statically because some systems can only link executables to a single
+# shared library and libhdf5 is much bigger than libh5tools.
+LT_LINK_LIB=$(LT) --mode=link $(CC) -static
 LIB=libh5tools.a
 PROGS=h5debug h5import h5ls h5repart h5dump @H5TOH4@
 
@@ -33,28 +36,28 @@ TEST_SRC=
 TEST_OBJ=$(TEST_SRC:.c=.o)
 
 # Programs have to be built before they can be tested!
-test _test: $(PROGS)
+check test _test: $(PROGS)
 
 # How to build the programs... They all depend on the hdf5 library and
 # the tools library compiled in this directory.
-$(PROGS): ../src/libhdf5.a $(LIB)
+$(PROGS): $(LIB) ../src/libhdf5.la
 
 h5debug: h5debug.o
-	$(CC) $(CFLAGS) -o $@ h5debug.o $(LDFLAGS) $(LIBS)
+	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5debug.o $(LIB) $(LDFLAGS) $(LIBS)
 
 h5import: h5import.o
-	$(CC) $(CFLAGS) -o $@ h5import.o $(LDFLAGS) $(LIBS)
+	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5import.o $(LIB) $(LDFLAGS) $(LIBS)
 
 h5ls: h5ls.o
-	$(CC) $(CFLAGS) -o $@ h5ls.o $(LDFLAGS) $(LIBS)
+	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5ls.o $(LIB) $(LDFLAGS) $(LIBS)
 
 h5repart: h5repart.o
-	$(CC) $(CFLAGS) -o $@ h5repart.o $(LDFLAGS) $(LIBS)
+	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5repart.o $(LIB) $(LDFLAGS) $(LIBS)
 
 h5dump: h5dump.o h5dumputil.o
-	$(CC) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LDFLAGS) $(LIBS)
+	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5dump.o h5dumputil.o $(LIB) $(LDFLAGS) $(LIBS)
 
 h5toh4: h5toh4.o
-	$(CC) $(CFLAGS) -o $@ h5toh4.o $(LDFLAGS) $(LIBS)
+	$(LT_LINK_EXE) $(CFLAGS) -o $@ h5toh4.o $(LIB) $(LDFLAGS) $(LIBS)
 
 @CONCLUDE@