diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-04-14 21:21:59 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-04-14 21:21:59 (GMT) |
| commit | 98362b664c5299950edaa85448b219b372106b0b (patch) | |
| tree | a5d95898916b57abc11b6dab2e53683be55ca31a /fortran/src/Makefile.in | |
| parent | a45c7424b2d849c8876d4681d0815367f6e5c7f6 (diff) | |
| download | hdf5-98362b664c5299950edaa85448b219b372106b0b.zip hdf5-98362b664c5299950edaa85448b219b372106b0b.tar.gz hdf5-98362b664c5299950edaa85448b219b372106b0b.tar.bz2 | |
[svn-r20504] Purpose:
General shared library improvements for CYGWIN / AIX
Description:
Shared libraries are disabled on both CYGWIN and AIX due
to inability to build them correctly. Part of the problem
in both of these situations is the lack of the libtool
flag -no-undefined, which tells libtool that all needed
symbols are defined at link time (a requirement on these
systems) and that it's okay to build shared libraries.
Another problem are lack of dependencies between wrapper
libraries and core C HDF5 library.
This patch addresses both of these by fixing configure to
add in -no-undefined flag for libtool during linking and
adds automake dependencies in the Makefile.am files.
After testing, both CYGWIN and AIX now generate shared
libraries, but there are still some test failures in each.
(cache_api, dt_arith, and testerror.sh on CYGWIN, and
fortran tests on AIX).
Even though the shared libraries are not quite perfect,
this is a general improvement to what we had before, so
I'm applying the patch anyways. Note that default behavior
of shared libraries on these systems being disabled has
NOT been changed and requires the use of the
--enable-unsupported to attempt to build them.
We will need to address the test failures in each
architecture prior to formally supporting shared
libraries on each.
Tested:
h5committested & CYGWIN tested (on bangan)
(AIX tested by Albert on bp-login2)
Diffstat (limited to 'fortran/src/Makefile.in')
| -rw-r--r-- | fortran/src/Makefile.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 7d0979a..565137c 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -96,7 +96,7 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libhdf5_fortran_la_LIBADD = +libhdf5_fortran_la_DEPENDENCIES = $(LIBHDF5) am__libhdf5_fortran_la_SOURCES_DIST = H5f90global.f90 \ H5fortran_types.f90 H5_ff.f90 H5Aff.f90 H5Dff.f90 H5Eff.f90 \ H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Lff.f90 H5Off.f90 H5Pff.f90 \ @@ -193,15 +193,17 @@ AMTAR = @AMTAR@ # but which should not be exported to h5cc for building other programs. # AM_CFLAGS is an automake construct which should be used by Makefiles # instead of CFLAGS, as CFLAGS is reserved solely for the user to define. +# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well. AM_CFLAGS = @AM_CFLAGS@ @H5_CFLAGS@ AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_srcdir)/src \ -I$(top_srcdir)/fortran/src -AM_LDFLAGS = @AM_LDFLAGS@ $(am__append_1) +AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1) AM_MAKEFLAGS = @AM_MAKEFLAGS@ AR = @AR@ +AS = @AS@ # Set the paths for AFS installs of autotools for Linux machines # Ideally, these tools should never be needed during the build. @@ -264,6 +266,7 @@ H5_CXXFLAGS = @H5_CXXFLAGS@ H5_CXX_SHARED = @H5_CXX_SHARED@ H5_FCFLAGS = @H5_FCFLAGS@ H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@ +H5_LDFLAGS = @H5_LDFLAGS@ H5_LONE_COLON = @H5_LONE_COLON@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ @@ -502,6 +505,9 @@ libhdf5_fortran_la_SOURCES = H5f90global.f90 \ $(PARALLEL_COND_SRC) +# HDF5 Fortran library depends on HDF5 Library. +libhdf5_fortran_la_LIBADD = $(LIBHDF5) + # h5fc is generated during configure. # Remove it only when distclean. DISTCLEANFILES = h5fc |