diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2014-04-25 19:34:54 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2014-04-25 19:34:54 (GMT) |
commit | b018ba48ced579975e60362e3acfb6afb1f1d384 (patch) | |
tree | 6aa56f1b84f2a5734964a72faefc33280e3cce47 /fortran/src/Makefile.in | |
parent | bbaec6dfe44e8878345de2594dc97f1bc8d361ba (diff) | |
download | hdf5-b018ba48ced579975e60362e3acfb6afb1f1d384.zip hdf5-b018ba48ced579975e60362e3acfb6afb1f1d384.tar.gz hdf5-b018ba48ced579975e60362e3acfb6afb1f1d384.tar.bz2 |
[svn-r25106] Removed LT_ADD_LIBHDF5_DEPENDENCY configure conditional to roll back fix for removing rpaths from lib files. The fix also removed dependencies on libhdf5, etc. when the --disable-sharedlib-rpath configure option was invoked.
Added instead configure variable hardcode_into_lib=no. This removes rpath from lib files on Linux and solaris machines.
Tested with h5committest on jam, koala, ostrich and platypus (cmake), and on emu and kite.
Diffstat (limited to 'fortran/src/Makefile.in')
-rw-r--r-- | fortran/src/Makefile.in | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index b273694..bc8e06e 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -148,8 +148,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libdir)" LTLIBRARIES = $(lib_LTLIBRARIES) -@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_fortran_la_DEPENDENCIES = \ -@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@ $(LIBHDF5) +libhdf5_fortran_la_DEPENDENCIES = $(LIBHDF5) am__libhdf5_fortran_la_SOURCES_DIST = H5f90global.f90 \ H5fortran_types.f90 H5_ff$(F_STATUS).f90 H5_ff.f90 H5Aff.f90 \ H5Dff.f90 H5Eff.f90 H5Fff.f90 H5Gff.f90 H5Iff.f90 H5Lff.f90 \ @@ -564,7 +563,6 @@ LIPO = @LIPO@ LL_PATH = @LL_PATH@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ -LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ @@ -774,9 +772,8 @@ libhdf5_fortran_la_SOURCES = H5f90global.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. However, only add the dependency -# if --enable-sharedlib-rpath is yes. -@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_fortran_la_LIBADD = $(LIBHDF5) +# HDF5 Fortran library depends on HDF5 Library. +libhdf5_fortran_la_LIBADD = $(LIBHDF5) # h5fc is generated during configure. # Remove it only when distclean. |