diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2019-08-01 14:40:01 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2019-08-01 14:40:01 (GMT) |
| commit | bb8904a75e68c925162e77169a47d4eb2ac00bd3 (patch) | |
| tree | 6b6ee8cfc42f5cf3723cbb76a827f039fd2535f1 /hl/fortran | |
| parent | 95910889d7ddba29f0343078b8e9b982d3bb974d (diff) | |
| parent | 4227b8948d7091205b4f8dc1271d7dcae01bb0fb (diff) | |
| download | hdf5-bb8904a75e68c925162e77169a47d4eb2ac00bd3.zip hdf5-bb8904a75e68c925162e77169a47d4eb2ac00bd3.tar.gz hdf5-bb8904a75e68c925162e77169a47d4eb2ac00bd3.tar.bz2 | |
Merge pull request #1826 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_minor_pr to develop
* commit '4227b8948d7091205b4f8dc1271d7dcae01bb0fb':
Reverts the removal of config/conclude_fc.am while keeping the changes to config/gnu-fflags.
Fixed a couple of typos.
Diffstat (limited to 'hl/fortran')
| -rw-r--r-- | hl/fortran/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.am | 3 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.am | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am index 71c2866..d383f9a 100644 --- a/hl/fortran/examples/Makefile.am +++ b/hl/fortran/examples/Makefile.am @@ -62,4 +62,4 @@ EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl # and fortran libraries above. include $(top_srcdir)/config/examples.am -include $(top_srcdir)/config/conclude.am +include $(top_srcdir)/config/conclude_fc.am diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index f51d595..37e074c 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -114,5 +114,4 @@ H5IMff.lo: $(srcdir)/H5IMff.F90 H5TBff.lo: $(srcdir)/H5TBff.F90 H5LTff_gen.lo: H5LTff.lo H5LTff_gen.F90 H5TBff_gen.lo: H5TBff.lo H5LTff_gen.F90 H5TBff_gen.F90 - -include $(top_srcdir)/config/conclude.am +include $(top_srcdir)/config/conclude_fc.am diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am index ef7cd4b..0552aaa 100644 --- a/hl/fortran/test/Makefile.am +++ b/hl/fortran/test/Makefile.am @@ -62,4 +62,4 @@ clean-local: # from tests in conclude.am) FORTRAN_API=yes -include $(top_srcdir)/config/conclude.am +include $(top_srcdir)/config/conclude_fc.am |