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 /hl/src | |
| 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 'hl/src')
| -rw-r--r-- | hl/src/Makefile.am | 5 | ||||
| -rw-r--r-- | hl/src/Makefile.in | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/hl/src/Makefile.am b/hl/src/Makefile.am index 34245ee..09c24dc 100644 --- a/hl/src/Makefile.am +++ b/hl/src/Makefile.am @@ -33,11 +33,8 @@ libhdf5_hl_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$( # List sources to include in the HDF5 HL Library. libhdf5_hl_la_SOURCES=H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c -# HDF5 HL library depends on HDF5 Library. However, only add the dependency -# if --enable-sharedlib-rpath is yes. -if LT_ADD_LIBHDF5_DEPENDENCY +# HDF5 HL library depends on HDF5 Library. libhdf5_hl_la_LIBADD=$(LIBHDF5) -endif # Public header files (to be installed) include_HEADERS=hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 430467d..54cbd17 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -141,8 +141,7 @@ am__uninstall_files_from_dir = { \ } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)" LTLIBRARIES = $(lib_LTLIBRARIES) -@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_hl_la_DEPENDENCIES = \ -@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@ $(LIBHDF5) +libhdf5_hl_la_DEPENDENCIES = $(LIBHDF5) am_libhdf5_hl_la_OBJECTS = H5DO.lo H5DS.lo H5IM.lo H5LT.lo \ H5LTanalyze.lo H5LTparse.lo H5PT.lo H5TB.lo libhdf5_hl_la_OBJECTS = $(am_libhdf5_hl_la_OBJECTS) @@ -501,7 +500,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@ @@ -684,9 +682,8 @@ libhdf5_hl_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$ # List sources to include in the HDF5 HL Library. libhdf5_hl_la_SOURCES = H5DO.c H5DS.c H5IM.c H5LT.c H5LTanalyze.c H5LTparse.c H5PT.c H5TB.c -# HDF5 HL library depends on HDF5 Library. However, only add the dependency -# if --enable-sharedlib-rpath is yes. -@LT_ADD_LIBHDF5_DEPENDENCY_TRUE@libhdf5_hl_la_LIBADD = $(LIBHDF5) +# HDF5 HL library depends on HDF5 Library. +libhdf5_hl_la_LIBADD = $(LIBHDF5) # Public header files (to be installed) include_HEADERS = hdf5_hl.h H5DOpublic.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h |