diff options
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/Makefile.in | 3 | ||||
| -rw-r--r-- | fortran/examples/Makefile.in | 3 | ||||
| -rw-r--r-- | fortran/src/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 10 | ||||
| -rw-r--r-- | fortran/test/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/test/Makefile.in | 5 | ||||
| -rw-r--r-- | fortran/testpar/Makefile.in | 3 |
7 files changed, 21 insertions, 7 deletions
diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 40377fa..848bd77 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -271,6 +271,9 @@ RM = rm -f CP = cp TIME = time +# Path for hl needed in hdf5.h +INCLUDES = -I$(top_srcdir)/hl/src + # Some machines need a command to run executables; this is that command # so that our tests will run. # We use RUNTESTS instead of RUNSERIAL directly because it may be that diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 683996f..6591013 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -264,6 +264,9 @@ RM = rm -f CP = cp TIME = time +# Path for hl needed in hdf5.h +INCLUDES = -I$(top_srcdir)/hl/src + # Some machines need a command to run executables; this is that command # so that our tests will run. # We use RUNTESTS instead of RUNSERIAL directly because it may be that diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index 52854a3..6188359 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/config/commence.am # Include src directory in both Fortran and C flags (C compiler is used # for linking). -INCLUDES = -I$(top_srcdir)/src +INCLUDES += -I$(top_srcdir)/src AM_FCFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/fortran/src AM_FCLIBS=$(LIBHDF5) diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 3f94a1e..5c8d792 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -326,6 +326,12 @@ RM = rm -f CP = cp TIME = time +# Path for hl needed in hdf5.h + +# Include src directory in both Fortran and C flags (C compiler is used +# for linking). +INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src + # Some machines need a command to run executables; this is that command # so that our tests will run. # We use RUNTESTS instead of RUNSERIAL directly because it may be that @@ -369,10 +375,6 @@ TRACE = perl $(top_srcdir)/bin/trace # .chklog files are output from those tests. # *.clog are from the MPE option. CHECK_CLEANFILES = *.chkexe *.chklog *.clog - -# Include src directory in both Fortran and C flags (C compiler is used -# for linking). -INCLUDES = -I$(top_srcdir)/src AM_FCFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/fortran/src AM_FCLIBS = $(LIBHDF5) diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am index 5301b90..360f8f0 100644 --- a/fortran/test/Makefile.am +++ b/fortran/test/Makefile.am @@ -21,7 +21,7 @@ include $(top_srcdir)/config/commence.am # Include files AM_FCFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src -INCLUDES=-I$(top_srcdir)/src -I$(top_builddir)/fortran/src +INCLUDES+=-I$(top_srcdir)/src -I$(top_builddir)/fortran/src # The Fortran test library noinst_LTLIBRARIES=libh5test_fortran.la diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 1915660..ca5b8e5 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -320,6 +320,10 @@ RM = rm -f CP = cp TIME = time +# Path for hl needed in hdf5.h +INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \ + -I$(top_builddir)/fortran/src + # Some machines need a command to run executables; this is that command # so that our tests will run. # We use RUNTESTS instead of RUNSERIAL directly because it may be that @@ -368,7 +372,6 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 # Include files AM_FCFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src -INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/fortran/src # The Fortran test library noinst_LTLIBRARIES = libh5test_fortran.la diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 595fff5..da9d96d 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -283,6 +283,9 @@ RM = rm -f CP = cp TIME = time +# Path for hl needed in hdf5.h +INCLUDES = -I$(top_srcdir)/hl/src + # Some machines need a command to run executables; this is that command # so that our tests will run. # We use RUNTESTS instead of RUNSERIAL directly because it may be that |