diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-02-09 21:06:14 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-02-09 21:06:14 (GMT) |
| commit | f6dd21fb11c6a5fa8503b0614715cdfdf738d380 (patch) | |
| tree | 4ba95688ee5af3398b45b5d851040451ea01910f /hl | |
| parent | 45ab968ad8c015b8fca0f6a56d1bee8a06ee067e (diff) | |
| download | hdf5-f6dd21fb11c6a5fa8503b0614715cdfdf738d380.zip hdf5-f6dd21fb11c6a5fa8503b0614715cdfdf738d380.tar.gz hdf5-f6dd21fb11c6a5fa8503b0614715cdfdf738d380.tar.bz2 | |
[svn-r11931] Purpose:
bug fix
Description:
the linking order in Makefile.am of the gif2h5 tool was causing linking errors on some configurations (pgcc, --disable-shared)
Solution:
changed the order of the linking (hl before hdf5)
Platforms tested:
linux, several configurations
solaris
Misc. update:
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/tools/gif2h5/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hl/tools/gif2h5/Makefile.am b/hl/tools/gif2h5/Makefile.am index 29db664..5318869 100644 --- a/hl/tools/gif2h5/Makefile.am +++ b/hl/tools/gif2h5/Makefile.am @@ -29,6 +29,6 @@ gif2h5_SOURCES=gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c h52gif_SOURCES=hdf2gif.c hdfgifwr.c readhdf.c # Programs all depend on the hdf5 library and the tools library -LDADD=$(LIBH5TOOLS) $(LIBHDF5) $(LIBH5_HL) +LDADD=$(LIBH5TOOLS) $(LIBH5_HL) $(LIBHDF5) include $(top_srcdir)/config/conclude.am diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 629af0a..d645719 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -74,8 +74,8 @@ am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) gif2mem.$(OBJEXT) \ gif2h5_OBJECTS = $(am_gif2h5_OBJECTS) gif2h5_LDADD = $(LDADD) am__DEPENDENCIES_1 = $(top_builddir)/tools/lib/libh5tools.la -am__DEPENDENCIES_2 = $(top_builddir)/src/libhdf5.la -am__DEPENDENCIES_3 = $(top_builddir)/hl/src/libhdf5_hl.la +am__DEPENDENCIES_2 = $(top_builddir)/hl/src/libhdf5_hl.la +am__DEPENDENCIES_3 = $(top_builddir)/src/libhdf5.la gif2h5_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_3) am_h52gif_OBJECTS = hdf2gif.$(OBJEXT) hdfgifwr.$(OBJEXT) \ @@ -344,7 +344,7 @@ gif2h5_SOURCES = gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c h52gif_SOURCES = hdf2gif.c hdfgifwr.c readhdf.c # Programs all depend on the hdf5 library and the tools library -LDADD = $(LIBH5TOOLS) $(LIBHDF5) $(LIBH5_HL) +LDADD = $(LIBH5TOOLS) $(LIBH5_HL) $(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., |