diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-12-16 15:58:37 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-12-16 15:58:37 (GMT) |
| commit | 51fdb1ebcf9e03e6ec203c6cda7ae190b5f81ddd (patch) | |
| tree | 21343f70b6ac2a26c84c23a1ca55d4e96fcf8014 /hl/tools | |
| parent | a735b263d3c20ac4a1b66ab6070a1a539b523f84 (diff) | |
| download | hdf5-51fdb1ebcf9e03e6ec203c6cda7ae190b5f81ddd.zip hdf5-51fdb1ebcf9e03e6ec203c6cda7ae190b5f81ddd.tar.gz hdf5-51fdb1ebcf9e03e6ec203c6cda7ae190b5f81ddd.tar.bz2 | |
[svn-r11799]
Purpose:
Bug fix
Description:
Libraries were listed in the wrong order in tools/gifconv Makefile.am, confusing
the linker.
Solution:
Put HDF5 library after tools library in Makefile.am and ran reconfigure.
Platforms tested:
mir, sleipnir
Diffstat (limited to 'hl/tools')
| -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 44aa189..db2f411 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=$(LIBHDF5) $(LIBH5TOOLS) +LDADD=$(LIBH5TOOLS) $(LIBHDF5) include $(top_srcdir)/config/conclude.am diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 20190f3..b9133a6 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -73,8 +73,8 @@ am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) gif2mem.$(OBJEXT) \ decompress.$(OBJEXT) gifread.$(OBJEXT) writehdf.$(OBJEXT) gif2h5_OBJECTS = $(am_gif2h5_OBJECTS) gif2h5_LDADD = $(LDADD) -am__DEPENDENCIES_1 = $(top_builddir)/src/libhdf5.la -am__DEPENDENCIES_2 = $(top_builddir)/tools/lib/libh5tools.la +am__DEPENDENCIES_1 = $(top_builddir)/tools/lib/libh5tools.la +am__DEPENDENCIES_2 = $(top_builddir)/src/libhdf5.la gif2h5_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) am_h52gif_OBJECTS = hdf2gif.$(OBJEXT) hdfgifwr.$(OBJEXT) \ readhdf.$(OBJEXT) @@ -341,7 +341,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 = $(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., |