From 30bfb1e0eaa2783479b2adcf81e0c147963140f6 Mon Sep 17 00:00:00 2001 From: James Laird Date: Tue, 1 Feb 2005 10:27:37 -0500 Subject: [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 --- Makefile.in | 1 + c++/Makefile.in | 1 + c++/examples/Makefile.in | 1 + c++/src/Makefile.in | 1 + c++/test/Makefile.in | 1 + config/commence.am | 1 + doc/Makefile.in | 1 + doc/html/ADGuide/Makefile.in | 1 + doc/html/Graphics/Makefile.in | 1 + doc/html/Intro/Makefile.in | 1 + doc/html/Makefile.in | 1 + doc/html/PSandPDF/Makefile.in | 1 + doc/html/TechNotes/Makefile.in | 1 + doc/html/Tutor/Graphics/Makefile.in | 1 + doc/html/Tutor/Makefile.in | 1 + doc/html/Tutor/examples/Makefile.in | 1 + doc/html/cpplus/Makefile.in | 1 + doc/html/ed_libs/Makefile.in | 1 + doc/html/ed_styles/Makefile.in | 1 + doc/html/fortran/Makefile.in | 1 + examples/Makefile.in | 1 + fortran/Makefile.in | 1 + fortran/examples/Makefile.in | 1 + fortran/src/Makefile.in | 1 + fortran/test/Makefile.am | 2 +- fortran/test/Makefile.in | 3 ++- fortran/testpar/Makefile.am | 3 +-- fortran/testpar/Makefile.in | 4 ++-- hl/Makefile.in | 1 + hl/fortran/Makefile.in | 1 + hl/fortran/src/Makefile.am | 2 +- hl/fortran/src/Makefile.in | 3 ++- hl/fortran/test/Makefile.am | 2 +- hl/fortran/test/Makefile.in | 3 ++- hl/src/Makefile.in | 1 + hl/test/Makefile.in | 1 + hl/tools/gif2h5/Makefile.in | 1 + perform/Makefile.in | 1 + src/Makefile.in | 1 + test/Makefile.in | 1 + testpar/Makefile.in | 1 + tools/Makefile.in | 1 + tools/gifconv/Makefile.in | 1 + tools/h5diff/Makefile.in | 1 + tools/h5dump/Makefile.in | 1 + tools/h5import/Makefile.in | 1 + tools/h5jam/Makefile.in | 1 + tools/h5ls/Makefile.in | 1 + tools/h5repack/Makefile.in | 1 + tools/lib/Makefile.in | 1 + tools/misc/Makefile.in | 1 + 51 files changed, 55 insertions(+), 10 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4c81a56..24fae1d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -191,6 +191,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ # Define subdirectories to build. diff --git a/c++/Makefile.in b/c++/Makefile.in index d349e85..c7ad184 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -194,6 +194,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ SUBDIRS = src test DIST_SUBDIRS = $(SUBDIRS) examples diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 13f94c9..096c733 100644 --- a/c++/examples/Makefile.in +++ b/c++/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@ # Use h5c++ to build examples, instead of reguar C++ compiler H5CPP = $(bindir)/h5c++ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index af17a34..1e4afd7 100644 --- a/c++/src/Makefile.in +++ b/c++/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 AM_CPPFLAGS = -I$(top_srcdir)/src diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 20879e2..bbfa64c 100644 --- a/c++/test/Makefile.in +++ b/c++/test/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, test, and c++/src directories AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src diff --git a/config/commence.am b/config/commence.am index fd55b97..2218bbb 100644 --- a/config/commence.am +++ b/config/commence.am @@ -30,6 +30,7 @@ H5FC_PP=$(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT=@F9XMODEXT@ +F9XMODFLAG=@F9XMODFLAG@ # Let automake worry about Makefiles and configure components being up-to- # date. diff --git a/doc/Makefile.in b/doc/Makefile.in index 06f7335..72bfd52 100644 --- a/doc/Makefile.in +++ b/doc/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 doc-specific include diff --git a/doc/html/ADGuide/Makefile.in b/doc/html/ADGuide/Makefile.in index 1df5341..82715bc 100644 --- a/doc/html/ADGuide/Makefile.in +++ b/doc/html/ADGuide/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5/ADGuide diff --git a/doc/html/Graphics/Makefile.in b/doc/html/Graphics/Makefile.in index e509a2d..e3b554a 100644 --- a/doc/html/Graphics/Makefile.in +++ b/doc/html/Graphics/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5/Graphics diff --git a/doc/html/Intro/Makefile.in b/doc/html/Intro/Makefile.in index e2c002c..9211b99 100644 --- a/doc/html/Intro/Makefile.in +++ b/doc/html/Intro/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5/Intro diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in index aed4a75..2fec127 100644 --- a/doc/html/Makefile.in +++ b/doc/html/Makefile.in @@ -184,6 +184,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5 diff --git a/doc/html/PSandPDF/Makefile.in b/doc/html/PSandPDF/Makefile.in index f5d805a..a06fbc0 100644 --- a/doc/html/PSandPDF/Makefile.in +++ b/doc/html/PSandPDF/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdirc)/hdf5/PSandPDF subdir = doc/html/PSandPDF diff --git a/doc/html/TechNotes/Makefile.in b/doc/html/TechNotes/Makefile.in index c796e98..0e6cf2c 100644 --- a/doc/html/TechNotes/Makefile.in +++ b/doc/html/TechNotes/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5/TechNotes diff --git a/doc/html/Tutor/Graphics/Makefile.in b/doc/html/Tutor/Graphics/Makefile.in index 46ce6b4..445cdcc 100644 --- a/doc/html/Tutor/Graphics/Makefile.in +++ b/doc/html/Tutor/Graphics/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5/Tutor/Graphics diff --git a/doc/html/Tutor/Makefile.in b/doc/html/Tutor/Makefile.in index 967eac5..e70bd8a 100644 --- a/doc/html/Tutor/Makefile.in +++ b/doc/html/Tutor/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ SUBDIRS = Graphics examples localdocdir = $(docdir)/hdf5/Tutor diff --git a/doc/html/Tutor/examples/Makefile.in b/doc/html/Tutor/examples/Makefile.in index 243ae98..d4103fc 100644 --- a/doc/html/Tutor/examples/Makefile.in +++ b/doc/html/Tutor/examples/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5/Tutor/examples diff --git a/doc/html/cpplus/Makefile.in b/doc/html/cpplus/Makefile.in index 533765f..5b69b40 100644 --- a/doc/html/cpplus/Makefile.in +++ b/doc/html/cpplus/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5/cpplus diff --git a/doc/html/ed_libs/Makefile.in b/doc/html/ed_libs/Makefile.in index f95e21c..947a0e9 100644 --- a/doc/html/ed_libs/Makefile.in +++ b/doc/html/ed_libs/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5/ed_libs diff --git a/doc/html/ed_styles/Makefile.in b/doc/html/ed_styles/Makefile.in index 132eaac..a453e70 100644 --- a/doc/html/ed_styles/Makefile.in +++ b/doc/html/ed_styles/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5/ed_styles diff --git a/doc/html/fortran/Makefile.in b/doc/html/fortran/Makefile.in index 3d2657d..a93a32e 100644 --- a/doc/html/fortran/Makefile.in +++ b/doc/html/fortran/Makefile.in @@ -180,6 +180,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ localdocdir = $(docdir)/hdf5/fortran diff --git a/examples/Makefile.in b/examples/Makefile.in index 4c56389..c9005fb 100644 --- a/examples/Makefile.in +++ b/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@ @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example @BUILD_PARALLEL_CONDITIONAL_FALSE@TEST_PROG_PARA = 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 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 diff --git a/perform/Makefile.in b/perform/Makefile.in index e609f5c..be6b8c4 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -194,6 +194,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib diff --git a/src/Makefile.in b/src/Makefile.in index 17c0198..32d4e04 100644 --- a/src/Makefile.in +++ b/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@ ######## Add '-I.' to the C preprocessor flags #AM_CFLAGS=-I$(srcdir) diff --git a/test/Makefile.in b/test/Makefile.in index af18870..71fd6da 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -194,6 +194,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ AM_CFLAGS = -I$(top_srcdir)/src diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 2494085..21e3180 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -194,6 +194,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test diff --git a/tools/Makefile.in b/tools/Makefile.in index 45edd6c..fbcc26d 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -194,6 +194,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ # All subdirectories SUBDIRS = lib h5dump h5diff h5ls misc gifconv h5import h5repack h5jam diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 9ac7700..af63b58 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/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 diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 11dbe3b..9488fc6 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/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 diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index ea4b21e..9359bac 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/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 files in /src directory and /tools/lib directory AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index daddb25..f4c3be0 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/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 diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 45d84c6..2e2758c 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -178,6 +178,7 @@ H5FC_PP = $(bindir)/h5pfc # Make sure that these variables are exported to the Makefiles F9XMODEXT = @F9XMODEXT@ +F9XMODFLAG = @F9XMODFLAG@ # # Copyright by the Board of Trustees of the University of Illinois. diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 90af7f3..c6fb593 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/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 diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index d02c45e..18242f8 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/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, test, and tools/lib directories AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 56278ef..455c6d7 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/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 files in /src directory AM_CFLAGS = -I$(top_srcdir)/src diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index f6387a4..48a0bb4 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/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 AM_CFLAGS = -I$(top_srcdir)/src -- cgit v0.12