summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2019-08-01 03:51:53 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2019-08-01 03:51:53 (GMT)
commit4227b8948d7091205b4f8dc1271d7dcae01bb0fb (patch)
tree313fdac807a3670596692905e94aa47b4bcdc5b8 /fortran
parent438935557e04d6025a389fbe5fccb6290a62c054 (diff)
downloadhdf5-4227b8948d7091205b4f8dc1271d7dcae01bb0fb.zip
hdf5-4227b8948d7091205b4f8dc1271d7dcae01bb0fb.tar.gz
hdf5-4227b8948d7091205b4f8dc1271d7dcae01bb0fb.tar.bz2
Reverts the removal of config/conclude_fc.am while keeping
the changes to config/gnu-fflags.
Diffstat (limited to 'fortran')
-rw-r--r--fortran/examples/Makefile.am2
-rw-r--r--fortran/src/Makefile.am2
-rw-r--r--fortran/test/Makefile.am2
-rw-r--r--fortran/testpar/Makefile.am2
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