diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2013-09-24 01:14:24 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2013-09-24 01:14:24 (GMT) |
commit | ab239810e1ae81f390a91dfbb3e5d68934efee55 (patch) | |
tree | ace4b146b778237765c69c6fb0288c4f6ba4081c /hl/c++/src | |
parent | c19d87b1fc55a3c89bbcea6d940e4b50a4961ef4 (diff) | |
download | hdf5-ab239810e1ae81f390a91dfbb3e5d68934efee55.zip hdf5-ab239810e1ae81f390a91dfbb3e5d68934efee55.tar.gz hdf5-ab239810e1ae81f390a91dfbb3e5d68934efee55.tar.bz2 |
[svn-r24194] Don't add hdf5 library dependencies to lib files when --disable-sharedlib-rpath configure option is invoked. Fix for HDFFV-8276.
Tested with h5committest and on hdf-duck.
Diffstat (limited to 'hl/c++/src')
-rw-r--r-- | hl/c++/src/Makefile.am | 5 | ||||
-rw-r--r-- | hl/c++/src/Makefile.in | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am index d2794c9..7961747 100644 --- a/hl/c++/src/Makefile.am +++ b/hl/c++/src/Makefile.am @@ -40,8 +40,11 @@ endif # At the moment, only the H5PT Packet Table has a C++ API. libhdf5_hl_cpp_la_SOURCES=H5PacketTable.cpp -# HDF5 HL C++ library depends on HDF5 HL Library and HDF5 C++ Library. +# HDF5 HL C++ library depends on HDF5 Library. However, only add the dependency +# if --enable-sharedlib-rpath is yes. +if LT_ADD_LIBHDF5_DEPENDENCY libhdf5_hl_cpp_la_LIBADD=$(LIBH5_HL) $(LIBH5CPP) +endif # Public headers include_HEADERS=H5PacketTable.h diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 65a1a5f..39daa9a 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -116,7 +116,8 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) -libhdf5_hl_cpp_la_DEPENDENCIES = $(LIBH5_HL) $(LIBH5CPP) +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_hl_cpp_la_DEPENDENCIES = \ +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@ $(LIBH5_HL) $(LIBH5CPP) am_libhdf5_hl_cpp_la_OBJECTS = H5PacketTable.lo libhdf5_hl_cpp_la_OBJECTS = $(am_libhdf5_hl_cpp_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -288,6 +289,7 @@ 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@ @@ -474,8 +476,9 @@ libhdf5_hl_cpp_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISIO # At the moment, only the H5PT Packet Table has a C++ API. libhdf5_hl_cpp_la_SOURCES = H5PacketTable.cpp -# HDF5 HL C++ library depends on HDF5 HL Library and HDF5 C++ Library. -libhdf5_hl_cpp_la_LIBADD = $(LIBH5_HL) $(LIBH5CPP) +# HDF5 HL C++ library depends on HDF5 Library. However, only add the dependency +# if --enable-sharedlib-rpath is yes. +@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_hl_cpp_la_LIBADD = $(LIBH5_HL) $(LIBH5CPP) # Public headers include_HEADERS = H5PacketTable.h |