summaryrefslogtreecommitdiffstats
path: root/fortran/src/Makefile.am
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-08-01 14:40:01 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-08-01 14:40:01 (GMT)
commitbb8904a75e68c925162e77169a47d4eb2ac00bd3 (patch)
tree6b6ee8cfc42f5cf3723cbb76a827f039fd2535f1 /fortran/src/Makefile.am
parent95910889d7ddba29f0343078b8e9b982d3bb974d (diff)
parent4227b8948d7091205b4f8dc1271d7dcae01bb0fb (diff)
downloadhdf5-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/src/Makefile.am')
-rw-r--r--fortran/src/Makefile.am2
1 files changed, 1 insertions, 1 deletions
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