summaryrefslogtreecommitdiffstats
path: root/fortran/test/Makefile.am
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-09-22 16:04:54 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-09-22 16:04:54 (GMT)
commita2236b4e89e2736e0080064aef0835e19709842a (patch)
tree7902ae9acda94d2bda3980653c760c6e9c950741 /fortran/test/Makefile.am
parent57d670faa68f1ce52d82652be5f88ee02f862545 (diff)
downloadhdf5-a2236b4e89e2736e0080064aef0835e19709842a.zip
hdf5-a2236b4e89e2736e0080064aef0835e19709842a.tar.gz
hdf5-a2236b4e89e2736e0080064aef0835e19709842a.tar.bz2
[svn-r27855] Merged revisions:
27509, 27515, 27517, 27521, 27524, 27525, 27537, 27555, 27570, 27575, 27585, 27586, 27590, 27591, 27592 from the trunk. Minor CMake and Fortran changes Tested on: jam (w/ gcc/gfortran 4.9.3)
Diffstat (limited to 'fortran/test/Makefile.am')
-rw-r--r--fortran/test/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 608b1e9..29c41ec 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -106,4 +106,4 @@ H5_test_buildiface_LDADD =
fflush2.chkexe_: fflush1.chkexe_
-include $(top_srcdir)/config/conclude.am
+include $(top_srcdir)/config/conclude_fc.am