[svn-r14470] Purpose: Fixing configure problem on IRIX64.

Description:	IRIX64 failed to build tools/h5import, as well as c++/test 
		with szip. This is because IRIX is very picky when it comes 
		to linking libraries, and must be done in specific order. 
		(other UNIXes are not as such, and thus the problem wasn't 
		present).

Solution:	Rearrange the order in which the libraries are
		linked on the compiler line by sorting the line that
		assigns libraries into the LDADD variable in the Makefile.am's
		of the two respective directories.

Tested:		IRIX64, kagiso, smirom

4 files changed, 8 insertions, 8 deletions

diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am
index f274681..4c5333f 100644
--- a/c++/test/Makefile.am
+++ b/c++/test/Makefile.am
@@ -35,7 +35,7 @@ TEST_PROG=dsets testhdf5
 check_PROGRAMS=$(TEST_PROG)
 
 # The tests depend on the hdf5 library, test library, and the c++ library
-LDADD=$(LIBH5CPP) $(LIBH5TEST) $(LIBHDF5)
+LDADD=$(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5)
 
 dsets_SOURCES=dsets.cpp h5cpputil.cpp
 testhdf5_SOURCES=testhdf5.cpp tattr.cpp tcompound.cpp tfile.cpp tfilter.cpp \
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index df28d21..d873c8e 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -65,14 +65,14 @@ am__EXEEXT_1 = dsets$(EXEEXT) testhdf5$(EXEEXT)
 am_dsets_OBJECTS = dsets.$(OBJEXT) h5cpputil.$(OBJEXT)
 dsets_OBJECTS = $(am_dsets_OBJECTS)
 dsets_LDADD = $(LDADD)
-dsets_DEPENDENCIES = $(LIBH5CPP) $(LIBH5TEST) $(LIBHDF5)
+dsets_DEPENDENCIES = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5)
 am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tattr.$(OBJEXT) \
 	tcompound.$(OBJEXT) tfile.$(OBJEXT) tfilter.$(OBJEXT) \
 	th5s.$(OBJEXT) trefer.$(OBJEXT) ttypes.$(OBJEXT) \
 	tvlstr.$(OBJEXT) h5cpputil.$(OBJEXT)
 testhdf5_OBJECTS = $(am_testhdf5_OBJECTS)
 testhdf5_LDADD = $(LDADD)
-testhdf5_DEPENDENCIES = $(LIBH5CPP) $(LIBH5TEST) $(LIBHDF5)
+testhdf5_DEPENDENCIES = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
 am__depfiles_maybe = depfiles
@@ -330,7 +330,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
 TEST_PROG = dsets testhdf5
 
 # The tests depend on the hdf5 library, test library, and the c++ library
-LDADD = $(LIBH5CPP) $(LIBH5TEST) $(LIBHDF5)
+LDADD = $(LIBH5TEST) $(LIBH5CPP) $(LIBHDF5)
 dsets_SOURCES = dsets.cpp h5cpputil.cpp
 testhdf5_SOURCES = testhdf5.cpp tattr.cpp tcompound.cpp tfile.cpp tfilter.cpp \
 	th5s.cpp trefer.cpp ttypes.cpp tvlstr.cpp h5cpputil.cpp
diff --git a/tools/h5import/Makefile.am b/tools/h5import/Makefile.am
index aabc6c4..a88cb36 100644
--- a/tools/h5import/Makefile.am
+++ b/tools/h5import/Makefile.am
@@ -35,6 +35,6 @@ SCRIPT_DEPEND=h5import$(EXEEXT)
 bin_PROGRAMS=h5import
 
 # All programs depend on the main hdf5 library and the tools library
-LDADD=$(LIBHDF5) $(LIBH5TOOLS)
+LDADD=$(LIBH5TOOLS) $(LIBHDF5)
 
 include $(top_srcdir)/config/conclude.am
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 2d437f1..b67f45f 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -70,11 +70,11 @@ PROGRAMS = $(bin_PROGRAMS)
 h5import_SOURCES = h5import.c
 h5import_OBJECTS = h5import.$(OBJEXT)
 h5import_LDADD = $(LDADD)
-h5import_DEPENDENCIES = $(LIBHDF5) $(LIBH5TOOLS)
+h5import_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
 h5importtest_SOURCES = h5importtest.c
 h5importtest_OBJECTS = h5importtest.$(OBJEXT)
 h5importtest_LDADD = $(LDADD)
-h5importtest_DEPENDENCIES = $(LIBHDF5) $(LIBH5TOOLS)
+h5importtest_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
 DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
 am__depfiles_maybe = depfiles
@@ -331,7 +331,7 @@ check_SCRIPT = h5importtestutil.sh
 SCRIPT_DEPEND = h5import$(EXEEXT)
 
 # All programs depend on the main hdf5 library and the tools library
-LDADD = $(LIBHDF5) $(LIBH5TOOLS)
+LDADD = $(LIBH5TOOLS) $(LIBHDF5)
 
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,