summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-02-16 17:17:49 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-02-16 17:17:49 (GMT)
commitb28b5fade93c4e72e045469481cde81c01f956cf (patch)
tree74924f2540b51fb3ca0bc9507b88c6aa015d6a8a /fortran
parent74fbb9e32794c315bf14a7c29c42c25a6ca2f5f3 (diff)
downloadhdf5-b28b5fade93c4e72e045469481cde81c01f956cf.zip
hdf5-b28b5fade93c4e72e045469481cde81c01f956cf.tar.gz
hdf5-b28b5fade93c4e72e045469481cde81c01f956cf.tar.bz2
[svn-r26188] Merged autotools fixes into the trunk:
HDFFV-9089, HDFFV-9091, HDFFV-9092, HDFFV-9094, HDFFV-9095
Diffstat (limited to 'fortran')
-rw-r--r--fortran/Makefile.in3
-rw-r--r--fortran/examples/Makefile.in3
-rw-r--r--fortran/src/Makefile.in3
-rw-r--r--fortran/test/Makefile.in3
-rw-r--r--fortran/testpar/Makefile.in3
-rw-r--r--fortran/testpar/hyper.f902
-rw-r--r--fortran/testpar/mdset.f902
-rw-r--r--fortran/testpar/ptest.f902
8 files changed, 13 insertions, 8 deletions
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 1bc48c0..2d0e0b7 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -105,7 +105,8 @@ DIST_COMMON = $(top_srcdir)/config/commence.am \
TESTS =
subdir = fortran
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
+ $(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index b6998e6..c468739 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -115,7 +115,8 @@ DIST_COMMON = $(top_srcdir)/config/commence.am \
TESTS = $(TEST_SCRIPT)
subdir = fortran/examples
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
+ $(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index f8fb374..7466528 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -112,7 +112,8 @@ noinst_PROGRAMS = H5match_types$(EXEEXT) H5fortran_detect$(EXEEXT) \
TESTS =
subdir = fortran/src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
+ $(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 2140faa..c2055c4 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -92,7 +92,8 @@ check_PROGRAMS = $(am__EXEEXT_2)
TESTS = $(am__EXEEXT_2)
subdir = fortran/test
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
+ $(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 18d64bf..97e59ed 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -109,7 +109,8 @@ check_PROGRAMS = $(am__EXEEXT_1)
TESTS =
subdir = fortran/testpar
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/aclocal_cxx.m4 \
+ $(top_srcdir)/m4/aclocal_fc.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.f90
index a2e2e07..a03095a 100644
--- a/fortran/testpar/hyper.f90
+++ b/fortran/testpar/hyper.f90
@@ -21,8 +21,8 @@
SUBROUTINE hyper(length,do_collective,do_chunk, mpi_size, mpi_rank, nerrors)
USE HDF5
USE TH5_MISC
+ USE mpi
IMPLICIT NONE
- INCLUDE 'mpif.h'
INTEGER, INTENT(in) :: length ! array length
LOGICAL, INTENT(in) :: do_collective ! use collective I/O
diff --git a/fortran/testpar/mdset.f90 b/fortran/testpar/mdset.f90
index 7fe431b..f24c862 100644
--- a/fortran/testpar/mdset.f90
+++ b/fortran/testpar/mdset.f90
@@ -21,8 +21,8 @@
SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_rank, nerrors)
USE HDF5
USE TH5_MISC
+ USE mpi
IMPLICIT NONE
- INCLUDE 'mpif.h'
INTEGER, INTENT(in) :: length ! array length
LOGICAL, INTENT(in) :: do_collective ! use collective I/O
diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.f90
index e474668..145d084 100644
--- a/fortran/testpar/ptest.f90
+++ b/fortran/testpar/ptest.f90
@@ -19,8 +19,8 @@
PROGRAM parallel_test
USE hdf5
+ USE mpi
IMPLICIT NONE
- INCLUDE 'mpif.h'
INTEGER :: mpierror ! MPI hdferror flag
INTEGER :: hdferror ! HDF hdferror flag