From d7883f21bf2d0d4b7b21397b42520a381364f30f Mon Sep 17 00:00:00 2001
From: James Laird <jlaird@hdfgroup.org>
Date: Sat, 26 Feb 2005 17:28:23 -0500
Subject: [svn-r10098] Purpose: Bug fix

Description:
Some machines and compilers were having trouble creating fortran libraries
as shared libraries.

Solution:
Added flag in Makefiles.am to create fortran libraries as shared libraries.
(This is how HDF5 was set up before automake changes; I forgot to add
these flags, and it didn't cause a problem until now.)

Platforms tested:
sleipnir, eirene, verbena

Misc. update:
---
 fortran/src/Makefile.am    | 2 +-
 fortran/src/Makefile.in    | 2 +-
 fortran/test/Makefile.am   | 5 +++--
 fortran/test/Makefile.in   | 5 +++--
 hl/fortran/src/Makefile.am | 3 +++
 hl/fortran/src/Makefile.in | 4 +++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index f2ffc1b..b7445d4 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -27,7 +27,7 @@ AM_FFLAGS=-I$(top_srcdir)/src
 # This is our main target, the fortran library
 lib_LTLIBRARIES=libhdf5_fortran.la
 
-# DEBUG - will linking statically solve fortran build problem?
+# Fortran library is linked statically to solve a build problem.
 libhdf5_fortran_la_LDFLAGS=-static
 
 # Include HDF5.f90 if parallel is disabled, HDF5mpiof*  if parallel is enabled
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index f72bb61..4aba994 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -201,7 +201,7 @@ AM_FFLAGS = -I$(top_srcdir)/src
 # This is our main target, the fortran library
 lib_LTLIBRARIES = libhdf5_fortran.la
 
-# DEBUG - will linking statically solve fortran build problem?
+# Fortran library is linked statically to solve a build problem.
 libhdf5_fortran_la_LDFLAGS = -static
 
 # Include HDF5.f90 if parallel is disabled, HDF5mpiof*  if parallel is enabled
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 376a19e..b9f0b8d 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -26,6 +26,9 @@ INCLUDES=-I$(top_srcdir)/src
 # The Fortran test library
 lib_LTLIBRARIES=libh5test_fortran.la
 
+# Fortran library is linked statically to solve a build problem.
+libh5test_fortran_la_LDFLAGS=-static
+
 # Our main targets, the tests themselves
 TEST_PROG=fortranlib_test fflush1 fflush2
 check_PROGRAMS=$(TEST_PROG)
@@ -34,8 +37,6 @@ libh5test_fortran_la_SOURCES=fortranlib_test.f90 tH5F.f90 tH5D.f90 \
         tH5R.f90 tH5S.f90 tH5T.f90 tH5VL.f90 tH5Z.f90 tH5Sselect.f90 \
         tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90 t.c
 
-libh5test_fortran_la_LDFLAGS=-static
-
 # Source files are used for both the library and fortranlib_test.
 # Automake will complain about this without the following workaround.
 fortranlib_test_FFLAGS=$(AM_FFLAGS)
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 2f345fb..d9ad763 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -200,6 +200,9 @@ INCLUDES = -I$(top_srcdir)/src
 # The Fortran test library
 lib_LTLIBRARIES = libh5test_fortran.la
 
+# Fortran library is linked statically to solve a build problem.
+libh5test_fortran_la_LDFLAGS = -static
+
 # Our main targets, the tests themselves
 TEST_PROG = fortranlib_test fflush1 fflush2
 check_PROGRAMS = $(TEST_PROG)
@@ -209,8 +212,6 @@ libh5test_fortran_la_SOURCES = fortranlib_test.f90 tH5F.f90 tH5D.f90 \
         tH5P.f90 tH5A.f90 tH5I.f90 tH5G.f90 tH5E.f90 tf.f90 t.c
 
 
-libh5test_fortran_la_LDFLAGS = -static
-
 # Source files are used for both the library and fortranlib_test.
 # Automake will complain about this without the following workaround.
 fortranlib_test_FFLAGS = $(AM_FFLAGS)
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index 9153247..994ccaa 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -17,6 +17,9 @@ AM_FFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
 # Our main target, the high-level fortran library
 lib_LTLIBRARIES=libhdf5hl_fortran.la
 
+# Fortran library is linked statically to solve a build problem.
+libhdf5hl_fortran_la_LDFLAGS=-static
+
 # Source files for the library
 if BUILD_PARALLEL_CONDITIONAL
     PARALLEL_COND_SRC=HDFDmpiof.c HDF5mpio.f90
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 8e6bcce..1bfc4f7 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -190,6 +190,9 @@ AM_FFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/s
 # Our main target, the high-level fortran library
 lib_LTLIBRARIES = libhdf5hl_fortran.la
 
+# Fortran library is linked statically to solve a build problem.
+libhdf5hl_fortran_la_LDFLAGS = -static
+
 # Source files for the library
 @BUILD_PARALLEL_CONDITIONAL_TRUE@PARALLEL_COND_SRC = HDFDmpiof.c HDF5mpio.f90
 
@@ -217,7 +220,6 @@ CONFIG_HEADER = $(top_builddir)/src/H5config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(lib_LTLIBRARIES)
 
-libhdf5hl_fortran_la_LDFLAGS =
 libhdf5hl_fortran_la_DEPENDENCIES = $(top_builddir)/hl/src/libhdf5_hl.la
 am_libhdf5hl_fortran_la_OBJECTS = H5LTfc.lo H5IMfc.lo H5TBfc.lo \
 	H5LTff.lo H5IMff.lo H5TBff.lo
-- 
cgit v0.12