diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-29 21:24:15 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-29 21:24:15 (GMT) |
| commit | 4df595c22da9c316b44a46602091fd5fe261abe9 (patch) | |
| tree | 12c3d4c44f41cf3b18764a708baab2fed93fabb8 /fortran/src/Makefile.am | |
| parent | 517cadac2647bf325720c74285381045fb84be30 (diff) | |
| parent | d169391529f253a9903b8e6cacf38c59ceefab07 (diff) | |
| download | hdf5-4df595c22da9c316b44a46602091fd5fe261abe9.zip hdf5-4df595c22da9c316b44a46602091fd5fe261abe9.tar.gz hdf5-4df595c22da9c316b44a46602091fd5fe261abe9.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'd169391529f253a9903b8e6cacf38c59ceefab07':
Parallel Fortran tests now use the MPI module instead of including mpif.h.
First stab at gfortran versions. Tested on gfortran 7-9 so far.
Moved the -std=f2008 option to gfortran 9 for now.
Updated gfortran options. * Removed conclude_fc.am, which was causing verbose builds. Need to investigate more, though. * Added gfortran 9 warnings and flags. This will need to be separated into other version blocks based on when the options first appeared. * The standard is now explicitly set at 2008.
Diffstat (limited to 'fortran/src/Makefile.am')
| -rw-r--r-- | fortran/src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index 4009439..3489566 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_fc.am +include $(top_srcdir)/config/conclude.am |