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 /c++/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 'c++/src/Makefile.in')
-rw-r--r-- | c++/src/Makefile.in | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index c4e07c5..604e7af6 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -146,8 +146,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) -@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_cpp_la_DEPENDENCIES = \ -@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@ $(LIBHDF5) +libhdf5_cpp_la_DEPENDENCIES = $(LIBHDF5) am_libhdf5_cpp_la_OBJECTS = H5Exception.lo H5IdComponent.lo \ H5Library.lo H5Attribute.lo H5Location.lo H5Object.lo \ H5PropList.lo H5FaccProp.lo H5FcreatProp.lo H5DcreatProp.lo \ @@ -513,7 +512,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@ @@ -704,9 +702,8 @@ libhdf5_cpp_la_SOURCES = H5Exception.cpp H5IdComponent.cpp H5Library.cpp H5DataSet.cpp H5CommonFG.cpp H5Group.cpp H5File.cpp -# HDF5 C++ library depends on HDF5 Library. However, only add the dependency -# if --enable-sharedlib-rpath is yes. -@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_cpp_la_LIBADD = $(LIBHDF5) +# HDF5 C++ library depends on HDF5 Library. +libhdf5_cpp_la_LIBADD = $(LIBHDF5) # Public headers include_HEADERS = H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \ |