summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-01-05 13:41:12 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-01-05 13:41:12 (GMT)
commitcceb9f06b8f213ef1cb360a4ef900536669a8dad (patch)
tree1b0a48f66337d7d0c8f7e9a31a9663e8ce0754e5 /hl
parentf9736d817e4b2e1c5ced39b232323c3b3f87d46a (diff)
parent0e34f0feaaeb6d2286f87f695f25fae45c070a42 (diff)
downloadhdf5-cceb9f06b8f213ef1cb360a4ef900536669a8dad.zip
hdf5-cceb9f06b8f213ef1cb360a4ef900536669a8dad.tar.gz
hdf5-cceb9f06b8f213ef1cb360a4ef900536669a8dad.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '0e34f0feaaeb6d2286f87f695f25fae45c070a42': (26 commits) HDFFV-10664 update reference file HDFFV-10664 update reference files HDFFV-10664 add missing function and check for restriction Remove "bad" statements at end of TEST_ERROR. Formerly arguments to FAIL_PUTS_ERROR Add RELEASE.txt entry for HDFFV-10596. Add semicolon at end of TEST_ERROR() invocation for consistency. Uninstall should remove the libhdf5_hl_fortran links. Add symlinks named libhdf5_hl_fortran* to libhdf5hl_fortran in Makefile.am to match cmake install and the name pattern for other hl lib files. Change FAIL_PUTS_ERROR to TEST_ERROR. Cleaned up the parallel flush test and set t_pflush1 to always fail. Also set CMake to handle this. Update calls: H5Dcreate to H5Dcreate2, H5Acreate to H5Acreate2. Removed a comment. Fix comment Align H5Lcreate_ud behavior with documentation for NULL udata pointer Update toolchain comment Use c99 standard cmake variable Add PGI toolchain Correction based on code review. HDFFV-10664 add check for state before set call HDFFV-10546 refactor variable name ...
Diffstat (limited to 'hl')
-rw-r--r--hl/fortran/src/Makefile.am14
1 files changed, 14 insertions, 0 deletions
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index a495e220..200a2ce 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -50,6 +50,19 @@ libhdf5hl_fortran_la_SOURCES=H5DSfc.c H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c \
# HDF5 HL Fortran library depends on HDF5 Library.
libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL) $(LIBH5F)
+# The name of the lib file doesn't follow the same pattern as the other hl lib
+# files, namely libhdf5_hl_*. Add a symlink with the compliant name to the
+# actual lib file.
+install-exec-hook:
+ cd $(DESTDIR)$(libdir) && \
+ if test -f libhdf5hl_fortran.a; then \
+ $(LN_S) libhdf5hl_fortran.a libhdf5_hl_fortran.a; \
+ fi; \
+ if test -f libhdf5hl_fortran.so; then \
+ $(LN_S) libhdf5hl_fortran.so libhdf5_hl_fortran.so; \
+ fi;
+
+
# Fortran module files can have different extensions and different names
# (e.g., different capitalizations) on different platforms. Write rules
# for them explicitly rather than trying to teach automake about them.
@@ -72,6 +85,7 @@ uninstall-local:
set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \
fi; \
fi
+ $(RM) $(DESTDIR)$(libdir)/libhdf5_hl_fortran*
# These are the helper programs we need to build.
noinst_PROGRAMS = H5HL_buildiface