summaryrefslogtreecommitdiffstats
path: root/hl/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 /hl/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 'hl/fortran/src/Makefile.am')
-rw-r--r--hl/fortran/src/Makefile.am3
1 files changed, 1 insertions, 2 deletions
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