diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-01-27 22:13:23 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-01-27 22:13:23 (GMT) |
commit | dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e (patch) | |
tree | 6ab85c0bdb5105585d589c77359db822ba7409f8 /fortran/src/Makefile.am | |
parent | 3ffdf81de41c8a3ebf79a6c593407a8f98dd1b01 (diff) | |
download | hdf5-dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e.zip hdf5-dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e.tar.gz hdf5-dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e.tar.bz2 |
[svn-r24651] Merged changes in the fortran directory from the trunk into the branch,
svn merge -r23351:24650 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran .
Tested: jam (gcc, intel), koala (gcc)
Diffstat (limited to 'fortran/src/Makefile.am')
-rw-r--r-- | fortran/src/Makefile.am | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index 12c38e2..2d597c6 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -79,8 +79,11 @@ libhdf5_fortran_la_SOURCES=H5f90global.f90 \ H5Aff$(F_STATUS).f90 H5Dff$(F_STATUS).f90 H5Eff$(F_STATUS).f90 H5Fff$(F_STATUS).f90 H5Lff$(F_STATUS).f90 \ H5Off$(F_STATUS).f90 H5Pff$(F_STATUS).f90 H5Rff$(F_STATUS).f90 H5Tff$(F_STATUS).f90 $(PARALLEL_COND_SRC) -# HDF5 Fortran library depends on HDF5 Library. +# HDF5 Fortran library depends on HDF5 Library. However, only add the dependency +# if --enable-sharedlib-rpath is yes. +if LT_ADD_LIBHDF5_DEPENDENCY libhdf5_fortran_la_LIBADD=$(LIBHDF5) +endif # h5fc is generated during configure. # Remove it only when distclean. |