summaryrefslogtreecommitdiffstats
path: root/c++/test
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2008-01-30 14:07:18 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2008-01-30 14:07:18 (GMT)
commitbd0e39e8e02b6ba487cddc462c3905b925aecfa4 (patch)
treeb5a55340773b85c2e5abb0b3a3a7f9ff45c84010 /c++/test
parentaeedf70ccdd657017a3ad06ebf2aafc8fb65e698 (diff)
downloadhdf5-bd0e39e8e02b6ba487cddc462c3905b925aecfa4.zip
hdf5-bd0e39e8e02b6ba487cddc462c3905b925aecfa4.tar.gz
hdf5-bd0e39e8e02b6ba487cddc462c3905b925aecfa4.tar.bz2
[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
Diffstat (limited to 'c++/test')
-rw-r--r--c++/test/Makefile.am2
-rw-r--r--c++/test/Makefile.in6
2 files changed, 4 insertions, 4 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