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 /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 'fortran')
| -rw-r--r-- | fortran/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/src/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/test/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/testpar/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am index 00afb3a..6bf2edb 100644 --- a/fortran/examples/Makefile.am +++ b/fortran/examples/Makefile.am @@ -105,4 +105,4 @@ compound_fortran2003: compound_fortran2003.f90 compound_complex_fortran2003: compound_complex_fortran2003.f90 include $(top_srcdir)/config/examples.am -include $(top_srcdir)/config/conclude.am +include $(top_srcdir)/config/conclude_fc.am diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index 3489566..4009439 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -165,4 +165,4 @@ HDF5.lo: $(srcdir)/HDF5.F90 H5f90global.lo H5_ff.lo H5Aff.lo \ H5Off.lo H5Pff.lo H5Rff.lo \ H5Sff.lo H5Tff.lo H5Zff.lo H5_gen.lo -include $(top_srcdir)/config/conclude.am +include $(top_srcdir)/config/conclude_fc.am diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index e5fe7d6..f0d7f03 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -100,4 +100,4 @@ H5_test_buildiface_LDADD = fflush2.chkexe_: fflush1.chkexe_ -include $(top_srcdir)/config/conclude.am +include $(top_srcdir)/config/conclude_fc.am diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am index 00bc3db..e597a84 100644 --- a/fortran/testpar/Makefile.am +++ b/fortran/testpar/Makefile.am @@ -48,4 +48,4 @@ LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5) # Mark this directory as part of the Fortran API FORTRAN_API=yes -include $(top_srcdir)/config/conclude.am +include $(top_srcdir)/config/conclude_fc.am |