summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-07-16 13:59:21 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-07-16 13:59:21 (GMT)
commit53b3d666e5069ff65db1f739b7f0eb3634032b58 (patch)
tree9ed01a92126832c2581bc143c34e7f6e2ed41ef0
parent08244fb237c774129fe6b17e9021a8447fe8797b (diff)
downloadhdf5-53b3d666e5069ff65db1f739b7f0eb3634032b58.zip
hdf5-53b3d666e5069ff65db1f739b7f0eb3634032b58.tar.gz
hdf5-53b3d666e5069ff65db1f739b7f0eb3634032b58.tar.bz2
[svn-r27399] code clean-up
-rw-r--r--fortran/src/H5_buildiface.F906
-rw-r--r--fortran/src/H5_f.c4
-rw-r--r--fortran/src/Makefile.am20
3 files changed, 7 insertions, 23 deletions
diff --git a/fortran/src/H5_buildiface.F90 b/fortran/src/H5_buildiface.F90
index 83d5009..9a42cbf 100644
--- a/fortran/src/H5_buildiface.F90
+++ b/fortran/src/H5_buildiface.F90
@@ -48,14 +48,14 @@
#include <H5config_f.inc>
-PROGRAM test_kind
+PROGRAM H5_buildiface
USE, INTRINSIC :: ISO_C_BINDING
IMPLICIT NONE
! These values are valid REAL KINDs (with corresponding C float) found during configure
H5_H5CONFIG_F_NUM_RKIND
H5_H5CONFIG_F_RKIND
-! These values are valid INTEGER KINDs (with corresponding C float) found during configure
+! These values are valid INTEGER KINDs (with corresponding C integer) found during configure
H5_H5CONFIG_F_NUM_IKIND
H5_H5CONFIG_F_IKIND
@@ -1018,7 +1018,7 @@ PROGRAM test_kind
CLOSE(11)
-END PROGRAM test_kind
+END PROGRAM H5_buildiface
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c
index 90edfa7..e527dce 100644
--- a/fortran/src/H5_f.c
+++ b/fortran/src/H5_f.c
@@ -284,8 +284,6 @@ h5init_types_c( hid_t_f * types, hid_t_f * floatingtypes, hid_t_f * integertypes
if ( H5Tset_precision (types[17], 128) < 0) return ret_value;
#endif
-
-/* #ifdef -MSB- */
/*
* FIND H5T_NATIVE_FLOAT_128
*/
@@ -758,7 +756,7 @@ h5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags,
/*
- * H5 Generic flags introduced in version 1.8 -MSB-
+ * H5 Generic flags introduced in version 1.8
*/
/* H5_index_t enum struct */
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index 3333ae6..734f46e 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -106,9 +106,8 @@ endif
# programs.
# It's a bit tricky to make sure that Automake builds things in the right
# order (especially when using 'gmake -j ...')
-# H5_buildiface is compiled and run to produce H5KIND***.
-# H5fortran_detect is compiled and run to produce H5fort_type_defines.h.
-# H5match_types.c then includes this file and can be compiled into
+# H5_buildiface is compiled and run to produce H5_gen.F90.
+# H5match_types.c then includes H5fort_type_defines.h and can be compiled into
# H5match_types. When H5match_types is run, it creates H5f90i_gen.h
# and H5fortran_types.F90, which are included in the Fortran library.
@@ -126,17 +125,6 @@ BUILT_SOURCES = H5f90i_gen.h
H5fortran_types.F90 H5f90i_gen.h: H5match_types$(EXEEXT)
$(RUNSERIAL) ./H5match_types$(EXEEXT)
-# H5fort_type_defines.h is created by running H5fortran_detect.
-# Obviously, H5fortran_detect needs to be built first.
-#H5fort_type_defines.h: H5fortran_detect$(EXEEXT)
-# $(RUNSERIAL) ./H5fortran_detect$(EXEEXT) > H5fort_type_defines.h
-
-#H5match_types.$(OBJEXT): H5fort_type_defines.h
-
-# Automake knows how to build fortran programs if we tell it the source
-# files.
-#H5fortran_detect_SOURCES = H5fortran_detect.F90
-
# H5_buildiface.F90 generates all the APIs that have a KIND type associated
# with them.
@@ -156,9 +144,7 @@ FORTRAN_API=yes
# doing a parallel make, some modules could be made way before the
# modules they depend upon are actually made. *sigh*
H5f90global.lo: $(srcdir)/H5f90global.F90 H5fortran_types.lo
-#H5fortran_types.lo: H5fortran_types.F90
-#H5fortran_detect.lo: H5fortran_detect.F90
-H5_buildiface.lo: $(srcdir)/H5_buildiface.F90
+H5_buildiface.lo: $(srcdir)/H5_buildiface.F90
H5_ff.lo: $(srcdir)/H5_ff.F90 H5f90global.lo
H5Aff.lo: $(srcdir)/H5Aff.F90 H5f90global.lo
H5Dff.lo: $(srcdir)/H5Dff.F90 H5f90global.lo