diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-01-30 14:07:18 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-01-30 14:07:18 (GMT) |
| commit | bd0e39e8e02b6ba487cddc462c3905b925aecfa4 (patch) | |
| tree | b5a55340773b85c2e5abb0b3a3a7f9ff45c84010 /tools | |
| parent | aeedf70ccdd657017a3ad06ebf2aafc8fb65e698 (diff) | |
| download | hdf5-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 'tools')
| -rw-r--r-- | tools/h5import/Makefile.am | 2 | ||||
| -rwxr-xr-x | tools/h5import/Makefile.in | 6 |
2 files changed, 4 insertions, 4 deletions
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., |