diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2016-08-18 16:48:28 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2016-08-18 16:48:28 (GMT) |
commit | 412e491872156edf06c32eea98531dfc9ee2fb6a (patch) | |
tree | 7a3f443ed58a1bcc91a450e824517bdb346c989c /fortran | |
parent | b6c989a9173f0f9808a98ecfeb624870a7ab3c2c (diff) | |
download | hdf5-412e491872156edf06c32eea98531dfc9ee2fb6a.zip hdf5-412e491872156edf06c32eea98531dfc9ee2fb6a.tar.gz hdf5-412e491872156edf06c32eea98531dfc9ee2fb6a.tar.bz2 |
[svn-r30299] Updated to rid the use of c_size_t and sizeof if storage_size is available.
Diffstat (limited to 'fortran')
-rw-r--r-- | fortran/test/Makefile.in | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 4ec1ad5..98ae631 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -103,19 +103,11 @@ CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libh5test_fortran_la_LIBADD = am__libh5test_fortran_la_SOURCES_DIST = tf_F90.f90 tf.f90 t.c \ - tf_F03.f90 tf_F08.f90 -@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@am_libh5test_fortran_la_OBJECTS = tf_F90.lo \ -@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ tf.lo \ -@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ t.lo -@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@am_libh5test_fortran_la_OBJECTS = tf_F03.lo \ -@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ tf.lo \ -@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ t.lo -@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@am_libh5test_fortran_la_OBJECTS = tf_F03.lo \ -@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@ tf.lo \ -@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@ t.lo -@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@am_libh5test_fortran_la_OBJECTS = tf_F08.lo \ -@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@ tf.lo \ -@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@ t.lo + tf_F08.f90 +@FORTRAN_HAVE_STORAGE_SIZE_FALSE@am_libh5test_fortran_la_OBJECTS = \ +@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ tf_F90.lo tf.lo t.lo +@FORTRAN_HAVE_STORAGE_SIZE_TRUE@am_libh5test_fortran_la_OBJECTS = \ +@FORTRAN_HAVE_STORAGE_SIZE_TRUE@ tf_F08.lo tf.lo t.lo libh5test_fortran_la_OBJECTS = $(am_libh5test_fortran_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -744,27 +736,13 @@ TEST_PROG = fortranlib_test fflush1 fflush2 fortranlib_test_1_8 \ # tf.f90 depends on either tf_F08.f90 or tf_F03.f90 so they need to be # compiled first -@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@libh5test_fortran_la_SOURCES = tf_F90.f90 \ -@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ tf.f90 \ -@FORTRAN_2003_CONDITIONAL_F_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ t.c +@FORTRAN_HAVE_STORAGE_SIZE_FALSE@libh5test_fortran_la_SOURCES = \ +@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ tf_F90.f90 tf.f90 t.c # tf.f90 depends on either tf_F08.f90 or tf_F03.f90 so they need to be # compiled first -@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@libh5test_fortran_la_SOURCES = tf_F03.f90 \ -@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ tf.f90 \ -@FORTRAN_2003_CONDITIONAL_F_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ t.c - -# tf.f90 depends on either tf_F08.f90 or tf_F03.f90 so they need to be -# compiled first -@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@libh5test_fortran_la_SOURCES = tf_F03.f90 \ -@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@ tf.f90 \ -@FORTRAN_HAVE_C_SIZEOF_FALSE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@ t.c - -# tf.f90 depends on either tf_F08.f90 or tf_F03.f90 so they need to be -# compiled first -@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@libh5test_fortran_la_SOURCES = tf_F08.f90 \ -@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@ tf.f90 \ -@FORTRAN_HAVE_C_SIZEOF_TRUE@@FORTRAN_HAVE_STORAGE_SIZE_TRUE@ t.c +@FORTRAN_HAVE_STORAGE_SIZE_TRUE@libh5test_fortran_la_SOURCES = \ +@FORTRAN_HAVE_STORAGE_SIZE_TRUE@ tf_F08.f90 tf.f90 t.c # Source files are used for both the library and fortranlib_test. # Automake will complain about this without the following workaround. @@ -1444,6 +1422,9 @@ uninstall-am: help: @$(top_srcdir)/bin/makehelp +@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ if FORTRAN_2003_CONDITIONAL_F +@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ else +@FORTRAN_HAVE_STORAGE_SIZE_FALSE@ endif # Fortran module files can have different extensions and different names # (e.g., different capitalizations) on different platforms. Write rules |