[svn-r9907] Purpose:

Bug fix

Description:
Different compilers use different flags to include Fortran module files

Solution:
Changed boilerplate to use configure variable rather than hardcoded -M flag.

Platforms tested:
sleipnir, sol, copper

7 files changed, 9 insertions, 6 deletions

diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 79efa93..87f9e8e 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -198,6 +198,7 @@ H5FC_PP = $(bindir)/h5pfc
 
 # Make sure that these variables are exported to the Makefiles
 F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
 
 @BUILD_PARALLEL_CONDITIONAL_TRUE@TESTPARALLEL_DIR = testpar
 
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 90c0a56..0015c20 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -194,6 +194,7 @@ H5FC_PP = $(bindir)/h5pfc
 
 # Make sure that these variables are exported to the Makefiles
 F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
 
 # These are the programs that 'make all' or 'make tests' will build and
 # that 'make check' will run.  List them in the order in which they should
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 65ae69c..9b1dc19 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -194,6 +194,7 @@ H5FC_PP = $(bindir)/h5pfc
 
 # Make sure that these variables are exported to the Makefiles
 F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
 
 # Include src directory in both Fortran and C flags (C compiler is used
 # for linking)
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 0e6bc55..454e431 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -20,7 +20,7 @@
 include $(top_srcdir)/config/commence.am
 
 # Include files
-AM_FFLAGS=-I$(top_builddir)/fortran/src -M$(top_builddir)/fortran/src
+AM_FFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
 AM_CFLAGS=-I$(top_srcdir)/src
 
 # The Fortran test library
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index f7a318a..a736e52 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -194,9 +194,10 @@ H5FC_PP = $(bindir)/h5pfc
 
 # Make sure that these variables are exported to the Makefiles
 F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
 
 # Include files
-AM_FFLAGS = -I$(top_builddir)/fortran/src -M$(top_builddir)/fortran/src
+AM_FFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
 AM_CFLAGS = -I$(top_srcdir)/src
 
 # The Fortran test library
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index fb32621..41414a8 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -20,8 +20,7 @@
 include $(top_srcdir)/config/commence.am
 
 # Include files
-AM_FFLAGS=-I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test
-MODULE=$(top_srcdir)/fortran/src
+AM_FFLAGS=-I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src
 
 # These are our main targets
 TEST_PROG_PARA=ptesthdf5_fortran
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index cca643d..244a2b3 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -194,10 +194,10 @@ H5FC_PP = $(bindir)/h5pfc
 
 # Make sure that these variables are exported to the Makefiles
 F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
 
 # Include files
-AM_FFLAGS = -I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test
-MODULE = $(top_srcdir)/fortran/src
+AM_FFLAGS = -I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src
 
 # These are our main targets
 TEST_PROG_PARA = ptesthdf5_fortran