mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-12 17:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r9907] Purpose:

Browse Source 
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
This commit is contained in:
James Laird 2005-02-01 10:27:37 -05:00
parent f1278ad78f
commit 30bfb1e0ea
51 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -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.

1
c++/Makefile.in
View File

@ -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

1
c++/examples/Makefile.in
View File

@ -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++

1
c++/src/Makefile.in
View File

@ -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

1
c++/test/Makefile.in
View File

@ -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

1
config/commence.am
View File

@ -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.

1
doc/Makefile.in
View File

@ -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

1
doc/html/ADGuide/Makefile.in
View File

@ -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

1
doc/html/Graphics/Makefile.in
View File

@ -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

1
doc/html/Intro/Makefile.in
View File

@ -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

1
doc/html/Makefile.in
View File

@ -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

1
doc/html/PSandPDF/Makefile.in
View File

@ -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

1
doc/html/TechNotes/Makefile.in
View File

@ -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

1
doc/html/Tutor/Graphics/Makefile.in
View File

@ -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

1
doc/html/Tutor/Makefile.in
View File

@ -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

1
doc/html/Tutor/examples/Makefile.in
View File

@ -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

1
doc/html/cpplus/Makefile.in
View File

@ -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

1
doc/html/ed_libs/Makefile.in
View File

@ -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

1
doc/html/ed_styles/Makefile.in
View File

@ -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

1
doc/html/fortran/Makefile.in
View File

@ -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

1
examples/Makefile.in
View File

@ -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 =

1
fortran/Makefile.in
View File

@ -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

1
fortran/examples/Makefile.in
View File

@ -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

1
fortran/src/Makefile.in
View File

@ -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)

2
fortran/test/Makefile.am
View File

@ -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

3
fortran/test/Makefile.in
View File

@ -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

3
fortran/testpar/Makefile.am
View File

@ -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

4
fortran/testpar/Makefile.in
View File

@ -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

1
hl/Makefile.in
View File

@ -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

1
hl/fortran/Makefile.in
View File

@ -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

2
hl/fortran/src/Makefile.am
View File

@ -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

3
hl/fortran/src/Makefile.in
View File

@ -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

2
hl/fortran/test/Makefile.am
View File

@ -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

3
hl/fortran/test/Makefile.in
View File

@ -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

1
hl/src/Makefile.in
View File

@ -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

1
hl/test/Makefile.in
View File

@ -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

1
hl/tools/gif2h5/Makefile.in
View File

@ -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

1
perform/Makefile.in
View File

@ -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

1
src/Makefile.in
View File

@ -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)

1
test/Makefile.in
View File

@ -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

1
testpar/Makefile.in
View File

@ -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

1
tools/Makefile.in
View File

@ -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

1
tools/gifconv/Makefile.in
View File

@ -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

1
tools/h5diff/Makefile.in
View File

@ -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

1
tools/h5dump/Makefile.in
View File

@ -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

1
tools/h5import/Makefile.in
View File

@ -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

1
tools/h5jam/Makefile.in
View File

@ -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.

1
tools/h5ls/Makefile.in
View File

@ -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

1
tools/h5repack/Makefile.in
View File

@ -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

1
tools/lib/Makefile.in
View File

@ -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

1
tools/misc/Makefile.in
View File

@ -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