summaryrefslogtreecommitdiffstats
path: root/hl
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 /hl
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 'hl')
-rw-r--r--hl/fortran/examples/Makefile.am2
-rw-r--r--hl/fortran/src/Makefile.am3
-rw-r--r--hl/fortran/test/Makefile.am2
3 files changed, 3 insertions, 4 deletions
diff --git a/hl/fortran/examples/Makefile.am b/hl/fortran/examples/Makefile.am
index 71c2866..d383f9a 100644
--- a/hl/fortran/examples/Makefile.am
+++ b/hl/fortran/examples/Makefile.am
@@ -62,4 +62,4 @@ EXAMPLETOPDIR=${DESTDIR}$(exec_prefix)/share/hdf5_examples/hl
# and fortran libraries above.
include $(top_srcdir)/config/examples.am
-include $(top_srcdir)/config/conclude.am
+include $(top_srcdir)/config/conclude_fc.am
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
diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am
index ef7cd4b..0552aaa 100644
--- a/hl/fortran/test/Makefile.am
+++ b/hl/fortran/test/Makefile.am
@@ -62,4 +62,4 @@ clean-local:
# from tests in conclude.am)
FORTRAN_API=yes
-include $(top_srcdir)/config/conclude.am
+include $(top_srcdir)/config/conclude_fc.am