diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2012-07-03 01:12:37 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2012-07-03 01:12:37 (GMT) |
| commit | 11861e66189884c860224de577b00a16e0afe0c0 (patch) | |
| tree | be17f326a36a39e26ac5572b93398ad60b3355f4 /fortran/test/Makefile.am | |
| parent | d05e1c8ca189173070a2fc1c30802ec8be479085 (diff) | |
| download | hdf5-11861e66189884c860224de577b00a16e0afe0c0.zip hdf5-11861e66189884c860224de577b00a16e0afe0c0.tar.gz hdf5-11861e66189884c860224de577b00a16e0afe0c0.tar.bz2 | |
[svn-r22509] Merged changes from the trunk into the branch:
svn merge -r 22163:22479 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
Fixed merged issue with fortran/test/tH5E_F03.f90 (missing part of the file) and
changed Makefile.am accordingly.
Diffstat (limited to 'fortran/test/Makefile.am')
| -rw-r--r-- | fortran/test/Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index d8cdef9..b261785 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -67,12 +67,8 @@ fortranlib_test_1_8_SOURCES = fortranlib_test_1_8.f90 \ tH5F.f90 tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90 if FORTRAN_2003_CONDITIONAL_F -# NAG compiler doesn't like the current tH5E_F03.f90 file since it has only comments -# and no executable statements. -# Removed from the list of modules to build. EIP 2012-06-28 -# tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 fortranlib_test_F03_SOURCES = fortranlib_test_F03.f90 \ - tH5F.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 + tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90 endif |