summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-04-26 18:10:31 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-04-26 18:10:31 (GMT)
commit139c899ba174fb8786cd4ad3723d9848f93f0c7b (patch)
tree92a37741193bf193db601895cd078913358c7204 /fortran
parent6bc71d32f923e4848aea5c5169df30ce28f1cf4a (diff)
downloadhdf5-139c899ba174fb8786cd4ad3723d9848f93f0c7b.zip
hdf5-139c899ba174fb8786cd4ad3723d9848f93f0c7b.tar.gz
hdf5-139c899ba174fb8786cd4ad3723d9848f93f0c7b.tar.bz2
[svn-r10667] Purpose:
Bug fix Description: Made High-Level Fortran code use automatically generated headers rather than a separate hardcoded header. Solution: Set hdf5/hl/fortran/src to include hdf5/fortran/src, so that it will find the copy of H5f90i.h in that directory. Took #include "H5private.h" out of H5f90i.h (and moved it to files that included H5f90i.h. Platforms tested: mir, modi4, pommier
Diffstat (limited to 'fortran')
-rw-r--r--fortran/src/H5f90.h1
-rw-r--r--fortran/src/H5f90i.h6
-rw-r--r--fortran/src/Makefile.am2
-rw-r--r--fortran/src/Makefile.in2
-rw-r--r--fortran/test/t.h3
5 files changed, 7 insertions, 7 deletions
diff --git a/fortran/src/H5f90.h b/fortran/src/H5f90.h
index a56cb0c..864da1c 100644
--- a/fortran/src/H5f90.h
+++ b/fortran/src/H5f90.h
@@ -17,6 +17,7 @@
#define _H5f90_H
#include "hdf5.h"
+#include "H5private.h"
#include "H5f90i.h"
#include "H5f90proto.h"
diff --git a/fortran/src/H5f90i.h b/fortran/src/H5f90i.h
index 221e854..d3a30e9 100644
--- a/fortran/src/H5f90i.h
+++ b/fortran/src/H5f90i.h
@@ -16,12 +16,6 @@
#ifndef _H5f90i_H
#define _H5f90i_H
-/*
- * Standard header files needed all the time
- */
-
-#include "H5private.h"
-
/*
* Include generated header. This header defines integer types,
* so this file only needs to define _fcd and real_f.
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index efc1aa2..da4549c 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -131,6 +131,8 @@ H5fort_type_defines.h: H5fortran_detect
# Automake knows how to build fortran programs if we tell it the source
# files.
+# H5fortran_detect_gen.f90 is generated by running H5fortran_detect.f90.
+# Only developers should need to do so.
H5fortran_detect_SOURCES = H5fortran_detect.f90
# Mark this directory as part of the Fortran API
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 9c828f3..6cfae71 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -385,6 +385,8 @@ BUILT_SOURCES = H5f90i_gen.h
# Automake knows how to build fortran programs if we tell it the source
# files.
+# H5fortran_detect_gen.f90 is generated by running H5fortran_detect.f90.
+# Only developers should need to do so.
H5fortran_detect_SOURCES = H5fortran_detect.f90
# Mark this directory as part of the Fortran API
diff --git a/fortran/test/t.h b/fortran/test/t.h
index 34cec34..d66f882 100644
--- a/fortran/test/t.h
+++ b/fortran/test/t.h
@@ -12,7 +12,8 @@
* access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#include "../../src/hdf5.h"
+#include "hdf5.h"
+#include "H5private.h"
#include "../src/H5f90i.h"
#include "../src/H5f90proto.h"