summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2012-06-29 20:39:42 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2012-06-29 20:39:42 (GMT)
commit732ae085dce0e472f72fb767e541bf9bf8f42628 (patch)
tree1cec47c83ad2c61d6eb8f442f0a35b28d576112a /fortran
parent2a3c0587ed70b615fd329cf8cc73571f90203f01 (diff)
downloadhdf5-732ae085dce0e472f72fb767e541bf9bf8f42628.zip
hdf5-732ae085dce0e472f72fb767e541bf9bf8f42628.tar.gz
hdf5-732ae085dce0e472f72fb767e541bf9bf8f42628.tar.bz2
[svn-r22504] Maintenance:
See HELPDESK-643 issue in JIRA. NAG Fortran compiler doesn't like the current tH5E_F03.f90 file that has only comments and no executable statements. Removed tH5E_F03.f90 from the list of modules to build. Tested on jam with Intel compiler using --enable-fortran2003 flag.
Diffstat (limited to 'fortran')
-rw-r--r--fortran/test/Makefile.am6
-rw-r--r--fortran/test/Makefile.in10
2 files changed, 12 insertions, 4 deletions
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index b261785..b05d651 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -67,8 +67,12 @@ 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 Fortran compiler doesn't like the current tH5E_F03.f90 file that 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 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
+ tH5F.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
endif
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 27198a8..f6a28cc 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -118,10 +118,9 @@ fortranlib_test_1_8_LDADD = $(LDADD)
fortranlib_test_1_8_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \
$(LIBH5F) $(LIBHDF5)
am__fortranlib_test_F03_SOURCES_DIST = fortranlib_test_F03.f90 \
- tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
+ tH5F.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
@FORTRAN_2003_CONDITIONAL_F_TRUE@am_fortranlib_test_F03_OBJECTS = fortranlib_test_F03.$(OBJEXT) \
@FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5F.$(OBJEXT) \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5E_F03.$(OBJEXT) \
@FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5L_F03.$(OBJEXT) \
@FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5P_F03.$(OBJEXT) \
@FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5T_F03.$(OBJEXT)
@@ -492,8 +491,13 @@ fortranlib_test_SOURCES = fortranlib_test.f90 \
fortranlib_test_1_8_SOURCES = fortranlib_test_1_8.f90 \
tH5F.f90 tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90
+
+# NAG Fortran compiler doesn't like the current tH5E_F03.f90 file that 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
@FORTRAN_2003_CONDITIONAL_F_TRUE@fortranlib_test_F03_SOURCES = fortranlib_test_F03.f90 \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
+@FORTRAN_2003_CONDITIONAL_F_TRUE@ tH5F.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
fflush1_SOURCES = fflush1.f90
fflush2_SOURCES = fflush2.f90