diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2000-10-11 17:09:28 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2000-10-11 17:09:28 (GMT) |
| commit | 7d4886e379d95f1bac250f2d056ef96e161e30ce (patch) | |
| tree | cd1d92322891e3557eeb8f3c5d883cb292aea4ed /fortran | |
| parent | c21431a67e5fdbdd762c3773b44b00f6cee79441 (diff) | |
| download | hdf5-7d4886e379d95f1bac250f2d056ef96e161e30ce.zip hdf5-7d4886e379d95f1bac250f2d056ef96e161e30ce.tar.gz hdf5-7d4886e379d95f1bac250f2d056ef96e161e30ce.tar.bz2 | |
[svn-r2664] Purpose:
*sigh*
Description:
Wasn't picking up a header file which is in the source directory.
Solution:
Changed some flags so that it does this now.
Platforms tested:
Modi4
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/examples/Makefile.in | 4 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 5 | ||||
| -rw-r--r-- | fortran/test/Makefile.in | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 805280e..471f029 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -9,7 +9,7 @@ top_builddir=../.. srcdir=@srcdir@ @COMMENCE@ -hdf5_dir=$(top_builddir)/../src +hdf5_builddir=$(top_builddir)/../src ## Add include directory to the C preprocessor flags and the h5test and hdf5 ## libraries to the library list. @@ -17,7 +17,7 @@ LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir) MFLAG=@F9XMODFLAG@ FFLAGS=$(MFLAG). $(MFLAG)../src FLIB=../src/libhdf5_fortran.la -HDF5LIB=$(hdf5_dir)/libhdf5.la +HDF5LIB=$(hdf5_builddir)/libhdf5.la ## These are the programs that `make all' or `make tests' will build and which ## `make check' will run. List them in the order they should be run. diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index fb86819..cc7b951 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -9,12 +9,13 @@ top_builddir=../.. srcdir=@srcdir@ @COMMENCE@ -hdf5_dir=$(top_builddir)/../src +hdf5_builddir=$(top_builddir)/../src +hdf5_builddir=$(top_srcdir)/../src TRACE=perl $(top_srcdir)/bin/trace ## Add `-I.' to the C preprocessor flags. -CPPFLAGS=-I. -I$(hdf5_dir) @CPPFLAGS@ +CPPFLAGS=-I. -I$(hdf5_builddir) -I$(hdf5_srcdir) @CPPFLAGS@ ## This is our main target LIB=libhdf5_fortran.la diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 74fe392..3b712ff 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -9,7 +9,8 @@ top_builddir=../.. srcdir=@srcdir@ @COMMENCE@ -hdf5_dir=$(top_builddir)/../src +hdf5_builddir=$(top_builddir)/../src +hdf5_builddir=$(top_builddir)/../src ## Add include directory to the C preprocessor flags and the h5test and hdf5 ## libraries to the library list. @@ -17,7 +18,7 @@ LT_LINK_LIB=$(LT) --mode=link $(F9X) -static -rpath $(libdir) MFLAG=@F9XMODFLAG@ FFLAGS=$(MFLAG). $(MFLAG)../src FLIB=../src/libhdf5_fortran.la -HDF5LIB=$(hdf5_dir)/libhdf5.la +HDF5LIB=$(hdf5_builddir)/libhdf5.la TEST_PROGS_SRC=fortranlib_test.f90 fflush1.f90 fflush2.f90 TEST_PROGS=$(TEST_PROGS_SRC:.f90=) |