summaryrefslogtreecommitdiffstats
path: root/hl
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-02-01 15:27:37 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-02-01 15:27:37 (GMT)
commit30bfb1e0eaa2783479b2adcf81e0c147963140f6 (patch)
tree2f21404e71d636322504afd40a0fd13ea3736af5 /hl
parentf1278ad78fa0a36e4722760de1a6ec87f1ae6a17 (diff)
downloadhdf5-30bfb1e0eaa2783479b2adcf81e0c147963140f6.zip
hdf5-30bfb1e0eaa2783479b2adcf81e0c147963140f6.tar.gz
hdf5-30bfb1e0eaa2783479b2adcf81e0c147963140f6.tar.bz2
[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
Diffstat (limited to 'hl')
-rwxr-xr-xhl/Makefile.in1
-rw-r--r--hl/fortran/Makefile.in1
-rw-r--r--hl/fortran/src/Makefile.am2
-rw-r--r--hl/fortran/src/Makefile.in3
-rw-r--r--hl/fortran/test/Makefile.am2
-rw-r--r--hl/fortran/test/Makefile.in3
-rw-r--r--hl/src/Makefile.in1
-rw-r--r--hl/test/Makefile.in1
-rw-r--r--hl/tools/gif2h5/Makefile.in1
9 files changed, 11 insertions, 4 deletions
diff --git a/hl/Makefile.in b/hl/Makefile.in
index a323a0c..170f066 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -189,6 +189,7 @@ H5FC_PP = $(bindir)/h5pfc
# Make sure that these variables are exported to the Makefiles
F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
@BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index 7128ac2..0e9baa5 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -189,6 +189,7 @@ H5FC_PP = $(bindir)/h5pfc
# Make sure that these variables are exported to the Makefiles
F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
SUBDIRS = src test
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index 22ac0d7..b50b239 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -12,7 +12,7 @@
include $(top_srcdir)/config/commence.am
AM_CPPFLAGS=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src $(top_builddir)/hl/src
-AM_FFLAGS=-I$(top_builddir)/fortran/src -M$(top_builddir)/fortran/src
+AM_FFLAGS=-I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
# Our main target, the high-level fortran library
lib_LTLIBRARIES=libhdf5hl_fortran.la
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 830abf5..b42e264 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -185,9 +185,10 @@ H5FC_PP = $(bindir)/h5pfc
# Make sure that these variables are exported to the Makefiles
F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src $(top_builddir)/hl/src
-AM_FFLAGS = -I$(top_builddir)/fortran/src -M$(top_builddir)/fortran/src
+AM_FFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
# Our main target, the high-level fortran library
lib_LTLIBRARIES = libhdf5hl_fortran.la
diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am
index cff6351..1853ccc 100644
--- a/hl/fortran/test/Makefile.am
+++ b/hl/fortran/test/Makefile.am
@@ -12,7 +12,7 @@
include $(top_srcdir)/config/commence.am
AM_CPPFLAGS=-I$(top_srcdir)/src $(top_builddir)/src
-AM_FFLAGS=-I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src -M$(top_builddir)/fortran/src -M$(top_builddir)/hl/fortran/src
+AM_FFLAGS=-I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src
# Our main target, the test programs
TEST_PROG=tstlite tstimage tsttable
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 3e08a45..caa84ad 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -185,9 +185,10 @@ H5FC_PP = $(bindir)/h5pfc
# Make sure that these variables are exported to the Makefiles
F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
AM_CPPFLAGS = -I$(top_srcdir)/src $(top_builddir)/src
-AM_FFLAGS = -I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src -M$(top_builddir)/fortran/src -M$(top_builddir)/hl/fortran/src
+AM_FFLAGS = -I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src
# Our main target, the test programs
TEST_PROG = tstlite tstimage tsttable
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index b0754c0..aa04e9f 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -184,6 +184,7 @@ H5FC_PP = $(bindir)/h5pfc
# Make sure that these variables are exported to the Makefiles
F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
# Add include directories to the C preprocessor flags
#AM_CPPFLAGS=-I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top-srcdir)/tools/lib
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index 92aed2f..8d15520 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -186,6 +186,7 @@ H5FC_PP = $(bindir)/h5pfc
# Make sure that these variables are exported to the Makefiles
F9XMODEXT = @F9XMODEXT@
+F9XMODFLAG = @F9XMODFLAG@
# Add include directories to C preprocessor flags
AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 9ac7700..af63b58 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/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 and tools/lib directories
AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib