diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-04-26 18:10:31 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-04-26 18:10:31 (GMT) |
| commit | 139c899ba174fb8786cd4ad3723d9848f93f0c7b (patch) | |
| tree | 92a37741193bf193db601895cd078913358c7204 /hl/fortran | |
| parent | 6bc71d32f923e4848aea5c5169df30ce28f1cf4a (diff) | |
| download | hdf5-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 'hl/fortran')
| -rw-r--r-- | hl/fortran/src/Makefile.am | 3 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am index f8bac0c..7d06024 100644 --- a/hl/fortran/src/Makefile.am +++ b/hl/fortran/src/Makefile.am @@ -11,7 +11,8 @@ include $(top_srcdir)/config/commence.am -AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src +INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \ + -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src AM_FCFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src # Fortran libraries are linked statically to solve a build problem. diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index eab3355..e1ad254 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -297,7 +297,9 @@ H5CC = $(bindir)/h5cc H5CC_PP = $(bindir)/h5pcc H5FC = $(bindir)/h5fc H5FC_PP = $(bindir)/h5pfc -AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src +INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \ + -I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src + AM_FCFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src # Fortran libraries are linked statically to solve a build problem. |