[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:

6 files changed, 12 insertions, 12 deletions

diff --git a/Makefile.am b/Makefile.am
index 717fa9c..7767ce7 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,8 +71,8 @@ else
    HDF5_HL_DIR=
 endif
 
-SUBDIRS = src test $(TESTPARALLEL_DIR)  $(CXX_DIR) \
-         $(FORTRAN_DIR) $(HDF5_HL_DIR) tools .
+SUBDIRS = src test $(TESTPARALLEL_DIR) $(CXX_DIR) $(FORTRAN_DIR) \
+          $(HDF5_HL_DIR) tools .
          
 DIST_SUBDIRS = src test testpar hl tools . c++ fortran perform examples
 
diff --git a/Makefile.in b/Makefile.in
index 168de63..e2db879 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -359,8 +359,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
 @BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran
 @BUILD_HDF5_HL_CONDITIONAL_FALSE@HDF5_HL_DIR = 
 @BUILD_HDF5_HL_CONDITIONAL_TRUE@HDF5_HL_DIR = hl
-SUBDIRS = src test $(TESTPARALLEL_DIR)  $(CXX_DIR) \
-         $(FORTRAN_DIR) $(HDF5_HL_DIR) tools .
+SUBDIRS = src test $(TESTPARALLEL_DIR) $(CXX_DIR) $(FORTRAN_DIR) \
+          $(HDF5_HL_DIR) tools .
 
 DIST_SUBDIRS = src test testpar hl tools . c++ fortran perform examples
 
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.,
diff --git a/tools/gifconv/Makefile.am b/tools/gifconv/Makefile.am
index 29db664..5318869 100644
--- a/tools/gifconv/Makefile.am
+++ b/tools/gifconv/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/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index 629af0a..d645719 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/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.,