From 91e56dc68db9b37fb536bac555e95953ba240ac2 Mon Sep 17 00:00:00 2001 From: James Laird Date: Fri, 21 Apr 2006 14:21:24 -0500 Subject: [svn-r12295] Purpose: Several bug fixes Description: Added config file for Cray X1 (previous file was misnamed) Simplified some code in hyperslab.c test that seemed to have been confusing compiler on Cray X1. Fixed typo in config/commence.am Cleaned up hl/src/Makefile.am Solution: All four fixes should be straightforward. The failure on Cray was very difficult to debug, but involved arithmetic errors. This change seems to fix it. Platforms tested: heping, copper, sol, some Cray X1 (more testing when system comes back up) --- MANIFEST | 2 +- Makefile.in | 6 +- c++/Makefile.in | 6 +- c++/examples/Makefile.in | 6 +- c++/src/Makefile.in | 6 +- c++/test/Makefile.in | 6 +- config/commence.am | 2 +- config/craynv | 188 ++++++++++++++++++++++++++++++++++++++++ config/nv1-cray | 188 ---------------------------------------- configure | 4 +- configure.in | 2 +- examples/Makefile.in | 6 +- fortran/Makefile.in | 6 +- fortran/examples/Makefile.in | 6 +- fortran/src/Makefile.in | 6 +- fortran/test/Makefile.in | 6 +- fortran/testpar/Makefile.in | 6 +- hl/Makefile.in | 6 +- hl/c++/Makefile.in | 6 +- hl/c++/examples/Makefile.in | 6 +- hl/c++/src/Makefile.in | 6 +- hl/c++/test/Makefile.in | 6 +- hl/examples/Makefile.in | 6 +- hl/fortran/Makefile.in | 6 +- hl/fortran/examples/Makefile.in | 6 +- hl/fortran/src/Makefile.in | 6 +- hl/fortran/test/Makefile.in | 6 +- hl/src/Makefile.am | 4 - hl/src/Makefile.in | 13 ++- hl/test/Makefile.in | 6 +- hl/tools/Makefile.in | 6 +- hl/tools/gif2h5/Makefile.in | 6 +- perform/Makefile.in | 6 +- src/Makefile.in | 6 +- test/Makefile.in | 6 +- test/hyperslab.c | 4 +- testpar/Makefile.in | 6 +- tools/Makefile.in | 6 +- tools/h5diff/Makefile.in | 6 +- tools/h5dump/Makefile.in | 6 +- tools/h5import/Makefile.in | 6 +- tools/h5jam/Makefile.in | 6 +- tools/h5ls/Makefile.in | 6 +- tools/h5repack/Makefile.in | 6 +- tools/lib/Makefile.in | 6 +- tools/misc/Makefile.in | 6 +- 46 files changed, 313 insertions(+), 316 deletions(-) create mode 100644 config/craynv delete mode 100644 config/nv1-cray diff --git a/MANIFEST b/MANIFEST index bd25acc..b92ff07 100644 --- a/MANIFEST +++ b/MANIFEST @@ -70,6 +70,7 @@ ./config/BlankForm ./config/commence.am ./config/conclude.am +./config/craynv ./config/dec-flags ./config/dec-osf4.x ./config/dec-osf5.x @@ -95,7 +96,6 @@ ./config/lt_vers.am ./config/mpich ./config/nec-superux14.1 -./config/nv1-cray ./config/Makefile.am.blank ./config/pgi-fflags ./config/pgi-flags diff --git a/Makefile.in b/Makefile.in index 11a7072..148e9a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -168,9 +168,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -178,7 +178,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/c++/Makefile.in b/c++/Makefile.in index 5e3f2af..8be03c2 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -138,9 +138,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -148,7 +148,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 85ae764..17d2ba5 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -135,9 +135,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -145,7 +145,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index cdf1b3c..1e55b5a 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -172,9 +172,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -182,7 +182,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 00f85df..8b5e64f 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -161,9 +161,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -171,7 +171,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/config/commence.am b/config/commence.am index e70b50e..8e48df3 100644 --- a/config/commence.am +++ b/config/commence.am @@ -76,7 +76,7 @@ endif # but which shouldn't be exported to h5cc for building other programs. CFLAGS=@CFLAGS@ @H5_CFLAGS@ CPPFLAGS=@CPPFLAGS@ @H5_CPPFLAGS@ -FFLAGS=@FFLAGS@ @H5_FFLAGS@ +FCFLAGS=@FCFLAGS@ @H5_FCFLAGS@ CXXFLAGS=@CXXFLAGS@ @H5_CXXFLAGS@ # The trace script; this is used on source files from the C library to diff --git a/config/craynv b/config/craynv new file mode 100644 index 0000000..4097f78 --- /dev/null +++ b/config/craynv @@ -0,0 +1,188 @@ +# -*- shell-script -*- +# +# Copyright by the Board of Trustees of the University of Illinois. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the files COPYING and Copyright.html. COPYING can be found at the root +# of the source code distribution tree; Copyright.html can be found at the +# root level of an installed copy of the electronic HDF5 document set and +# is linked from the top-level documents page. It can also be found at +# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have +# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. + + +# This file is part of the HDF5 build script. It is processed shortly +# after configure starts and defines, among other things, flags for +# the various compile modes. + +# Choosing a C Compiler +# --------------------- +# +# The user should be able to specify the compiler by setting the CC +# environment variable to the name of the compiler and any switches it +# requires for proper operation. If CC is unset then this script may +# set it. If CC is unset by time this script completes then configure +# will try `gcc' and `cc' in that order (perhaps some others too). +# +# Note: Code later in this file may depend on the value of $CC_BASENAME +# in order to distinguish between different compilers when +# deciding which compiler command-line switches to use. This +# variable is set based on the incoming value of $CC and is only +# used within this file. + +if test "X-" = "X-$CC"; then + CC=cc + CC_BASENAME=cc +fi +# no need to use RANLIB +RANLIB=: + +# C Compiler and Preprocessor Flags +# --------------------------------- +# +# Flags that end with `_CFLAGS' are always passed to the compiler. +# Flags that end with `_CPPFLAGS' are passed to the compiler when +# compiling but not when linking. +# +# DEBUG_CFLAGS Flags to pass to the compiler to create a +# DEBUG_CPPFLAGS library suitable for use with debugging +# tools. Usually this list will exclude +# optimization switches (like `-O') and include +# switches that turn on symbolic debugging +# support (like `-g'). +# +# PROD_CFLAGS Flags to pass to the compiler to create a +# PROFILE_CPPFLAGS library suitable for performance testing (like +# `-pg'). This may or may not include debugging +# or production flags. +# +# CFLAGS Flags can be added to this variable which +# might already be partially initialized. These +# flags will always be passed to the compiler +# and should include switches to turn on full +# warnings. HDF5 attempts to be ANSI and Posix +# compliant and employ good programming +# practices resulting in few if any +# warnings. +# +# Warning flags do not have to be added to CFLAGS +# variable if the compiler is the GNU gcc +# compiler or a descendent of gcc such as EGCS or PGCC. +# +# The CFLAGS should contains *something* or else +# configure will probably add `-g'. For most +# systems this isn't a problem but some systems +# will disable optimizations in favor of the +# `-g'. +# +# +# These flags should be set according to the compiler being used. +# There are two ways to check the compiler. You can try using `-v' or +# `--version' to see if the compiler will print a version string. You +# can use the value of $CC_BASENAME which is the base name of the +# first word in $CC (note that the value of CC may have changed +# above). + +case $CC_BASENAME in + gcc) + CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O3 -fomit-frame-pointer" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; + + cc) + CFLAGS="$CFLAGS" + DEBUG_CFLAGS="-g" + DEBUG_CPPFLAGS= + PROD_CFLAGS="" + PROD_CPPFLAGS= + PROFILE_CFLAGS= + PROFILE_CPPFLAGS= + ;; + + *) + CFLAGS="$CFLAGS -ansi" + DEBUG_CFLAGS="-g" + DEBUG_CPPFLAGS= + PROD_CFLAGS="-O" + PROD_CPPFLAGS= + PROFILE_CFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; +esac + + + +# Overriding Configure Tests +# -------------------------- +# +# Values for overriding configuration tests when cross compiling. +# This includes compiling on some machines where the serial front end +# compiles for a parallel back end. + +# Set this to `yes' or `no' depending on whether the target is big +# endian or little endian. +#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'} + +# Set this to the width required by printf() to print type `long +# long'. For instance, if the format would be `%lld' then set it to +# `ll' or if the format would be `%qd' set it to `q'. +#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'} + +# Hard set the flag to indicate that converting denormalized floating-point +# values doesn't work. +hdf5_cv_convert_denormal_float=${hdf5_cv_convert_denormal_float='no'} + +# The default Fortran 90 compiler + +if test "X-" = "X-$F9X"; then + F9X=ftn +fi + +if test "X-" = "X-$f9x_flags_set"; then + # -Wl passes flags to the linker and -M# will ignore warnings with + # number #. Warning 405 and 412 were stopping the executable from being built. + F9XSUFFIXFLAG="" + FSEARCH_DIRS="" + FCFLAGS="$FCFLAGS -em" + DEBUG_FCFLAGS="-g" + PROD_FCFLAGS="" + PROFILE_FCFLAGS="" + f9x_flags_set=yes +fi + +# The default C++ compiler + +if test -z "$CXX"; then + CXX="CC" + CXX_BASENAME=CC +fi + +case $CXX_BASENAME in + g++) + CXXFLAGS="$CXXFLAGS -Wsign-compare" #Only works for some versions + DEBUG_CXXFLAGS="-g -fverbose-asm" + DEBUG_CPPFLAGS= + PROD_CXXFLAGS="-O3 -fomit-frame-pointer" + PROD_CPPFLAGS= + PROFILE_CXXFLAGS="-pg" + PROFILE_CPPFLAGS= + ;; + + *) + CXXFLAGS="$CXXFLAGS" + DEBUG_CXXFLAGS="-g" + DEBUG_CPPFLAGS= + PROD_CXXFLAGS="" + PROD_CPPFLAGS= + PROFILE_CXXFLAGS= + PROFILE_CPPFLAGS= + ;; +esac + diff --git a/config/nv1-cray b/config/nv1-cray deleted file mode 100644 index bdd590a..0000000 --- a/config/nv1-cray +++ /dev/null @@ -1,188 +0,0 @@ -# -*- shell-script -*- -# -# Copyright by the Board of Trustees of the University of Illinois. -# All rights reserved. -# -# This file is part of HDF5. The full HDF5 copyright notice, including -# terms governing use, modification, and redistribution, is contained in -# the files COPYING and Copyright.html. COPYING can be found at the root -# of the source code distribution tree; Copyright.html can be found at the -# root level of an installed copy of the electronic HDF5 document set and -# is linked from the top-level documents page. It can also be found at -# http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have -# access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. - - -# This file is part of the HDF5 build script. It is processed shortly -# after configure starts and defines, among other things, flags for -# the various compile modes. - -# Choosing a C Compiler -# --------------------- -# -# The user should be able to specify the compiler by setting the CC -# environment variable to the name of the compiler and any switches it -# requires for proper operation. If CC is unset then this script may -# set it. If CC is unset by time this script completes then configure -# will try `gcc' and `cc' in that order (perhaps some others too). -# -# Note: Code later in this file may depend on the value of $CC_BASENAME -# in order to distinguish between different compilers when -# deciding which compiler command-line switches to use. This -# variable is set based on the incoming value of $CC and is only -# used within this file. - -if test "X-" = "X-$CC"; then - CC=cc - CC_BASENAME=cc -fi -# no need to use RANLIB -RANLIB=: - -# C Compiler and Preprocessor Flags -# --------------------------------- -# -# Flags that end with `_CFLAGS' are always passed to the compiler. -# Flags that end with `_CPPFLAGS' are passed to the compiler when -# compiling but not when linking. -# -# DEBUG_CFLAGS Flags to pass to the compiler to create a -# DEBUG_CPPFLAGS library suitable for use with debugging -# tools. Usually this list will exclude -# optimization switches (like `-O') and include -# switches that turn on symbolic debugging -# support (like `-g'). -# -# PROD_CFLAGS Flags to pass to the compiler to create a -# PROFILE_CPPFLAGS library suitable for performance testing (like -# `-pg'). This may or may not include debugging -# or production flags. -# -# CFLAGS Flags can be added to this variable which -# might already be partially initialized. These -# flags will always be passed to the compiler -# and should include switches to turn on full -# warnings. HDF5 attempts to be ANSI and Posix -# compliant and employ good programming -# practices resulting in few if any -# warnings. -# -# Warning flags do not have to be added to CFLAGS -# variable if the compiler is the GNU gcc -# compiler or a descendent of gcc such as EGCS or PGCC. -# -# The CFLAGS should contains *something* or else -# configure will probably add `-g'. For most -# systems this isn't a problem but some systems -# will disable optimizations in favor of the -# `-g'. -# -# -# These flags should be set according to the compiler being used. -# There are two ways to check the compiler. You can try using `-v' or -# `--version' to see if the compiler will print a version string. You -# can use the value of $CC_BASENAME which is the base name of the -# first word in $CC (note that the value of CC may have changed -# above). - -case $CC_BASENAME in - gcc) - CFLAGS="$CFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O3 -fomit-frame-pointer" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; - - cc) - CFLAGS="$CFLAGS" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - PROD_CFLAGS="" - PROD_CPPFLAGS= - PROFILE_CFLAGS= - PROFILE_CPPFLAGS= - ;; - - *) - CFLAGS="$CFLAGS -ansi" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; -esac - - - -# Overriding Configure Tests -# -------------------------- -# -# Values for overriding configuration tests when cross compiling. -# This includes compiling on some machines where the serial front end -# compiles for a parallel back end. - -# Set this to `yes' or `no' depending on whether the target is big -# endian or little endian. -#ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'} - -# Set this to the width required by printf() to print type `long -# long'. For instance, if the format would be `%lld' then set it to -# `ll' or if the format would be `%qd' set it to `q'. -#hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'} - -# Hard set the flag to indicate that converting denormalized floating-point -# values doesn't work. -hdf5_cv_convert_denormal_float=${hdf5_cv_convert_denormal_float='no'} - -# The default Fortran 90 compiler - -if test "X-" = "X-$F9X"; then - F9X=ftn -fi - -if test "X-" = "X-$f9x_flags_set"; then - # -Wl passes flags to the linker and -M# will ignore warnings with - # number #. Warning 405 and 412 were stopping the executable from being built. - F9XSUFFIXFLAG="" - FSEARCH_DIRS="" - FFLAGS="$FFLAGS" - DEBUG_FFLAGS="-g" - PROD_FFLAGS="" - PROFILE_FFLAGS="" - f9x_flags_set=yes -fi - -# The default C++ compiler - -if test -z "$CXX"; then - CXX="CC" - CXX_BASENAME=CC -fi - -case $CXX_BASENAME in - g++) - CXXFLAGS="$CXXFLAGS -Wsign-compare" #Only works for some versions - DEBUG_CXXFLAGS="-g -fverbose-asm" - DEBUG_CPPFLAGS= - PROD_CXXFLAGS="-O3 -fomit-frame-pointer" - PROD_CPPFLAGS= - PROFILE_CXXFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; - - *) - CXXFLAGS="$CXXFLAGS" - DEBUG_CXXFLAGS="-g" - DEBUG_CPPFLAGS= - PROD_CXXFLAGS="" - PROD_CPPFLAGS= - PROFILE_CXXFLAGS= - PROFILE_CPPFLAGS= - ;; -esac - diff --git a/configure b/configure index ada1571..1b0d61e 100755 --- a/configure +++ b/configure @@ -467,7 +467,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CFLAGS H5_CPPFLAGS H5_FFLAGS H5_CXXFLAGS TR HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F F9XSUFFIXFLAG FSEARCH_DIRS FC FCFLAGS ac_ct_FC F9XMODFLAG F9XMODEXT FCLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LT_STATIC_EXEC PERL AR FORTRAN_SHARED_CONDITIONAL_TRUE FORTRAN_SHARED_CONDITIONAL_FALSE CXX_SHARED_CONDITIONAL_TRUE CXX_SHARED_CONDITIONAL_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB CPP F77 FFLAGS ac_ct_F77 LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT USE_FILTER_SCALEOFFSET H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_ALL_CONDITIONAL_TRUE BUILD_ALL_CONDITIONAL_FALSE BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE BUILD_SHARED_ONLY_CONDITIONAL_TRUE BUILD_SHARED_ONLY_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CFLAGS H5_CPPFLAGS H5_FCFLAGS H5_CXXFLAGS TR HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE HDF5_INTERFACES R_LARGE R_INTEGER HADDR_T HSIZE_T HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F F9XSUFFIXFLAG FSEARCH_DIRS FC FCFLAGS ac_ct_FC F9XMODFLAG F9XMODEXT FCLIBS CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LT_STATIC_EXEC PERL AR FORTRAN_SHARED_CONDITIONAL_TRUE FORTRAN_SHARED_CONDITIONAL_FALSE CXX_SHARED_CONDITIONAL_TRUE CXX_SHARED_CONDITIONAL_FALSE EGREP LN_S ECHO ac_ct_AR RANLIB ac_ct_RANLIB CPP F77 FFLAGS ac_ct_F77 LIBTOOL AM_MAKEFLAGS USE_FILTER_DEFLATE USE_FILTER_SZIP PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL ADD_PARALLEL_FILES MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 USE_FILTER_NBIT USE_FILTER_SCALEOFFSET H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL HL_FOR BUILD_ALL_CONDITIONAL_TRUE BUILD_ALL_CONDITIONAL_FALSE BUILD_CXX_CONDITIONAL_TRUE BUILD_CXX_CONDITIONAL_FALSE BUILD_PABLO_CONDITIONAL_TRUE BUILD_PABLO_CONDITIONAL_FALSE BUILD_PARALLEL_CONDITIONAL_TRUE BUILD_PARALLEL_CONDITIONAL_FALSE BUILD_FORTRAN_CONDITIONAL_TRUE BUILD_FORTRAN_CONDITIONAL_FALSE BUILD_HDF5_HL_CONDITIONAL_TRUE BUILD_HDF5_HL_CONDITIONAL_FALSE BUILD_SHARED_ONLY_CONDITIONAL_TRUE BUILD_SHARED_ONLY_CONDITIONAL_FALSE SEARCH SETX LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -52061,7 +52061,7 @@ s,@host_os@,$host_os,;t t s,@CPPFLAGS@,$CPPFLAGS,;t t s,@H5_CFLAGS@,$H5_CFLAGS,;t t s,@H5_CPPFLAGS@,$H5_CPPFLAGS,;t t -s,@H5_FFLAGS@,$H5_FFLAGS,;t t +s,@H5_FCFLAGS@,$H5_FCFLAGS,;t t s,@H5_CXXFLAGS@,$H5_CXXFLAGS,;t t s,@TR@,$TR,;t t s,@HSIZET@,$HSIZET,;t t diff --git a/configure.in b/configure.in index 3d913bd..c6f095a 100644 --- a/configure.in +++ b/configure.in @@ -78,7 +78,7 @@ dnl H5_CFLAGS (and company) are for CFLAGS that should be used on HDF5, but dnl not exported to h5cc (or h5fc, etc.) AC_SUBST([H5_CFLAGS]) AC_SUBST([H5_CPPFLAGS]) -AC_SUBST([H5_FFLAGS]) +AC_SUBST([H5_FCFLAGS]) AC_SUBST([H5_CXXFLAGS]) dnl Different compilers may need default libraries. They are specified in diff --git a/examples/Makefile.in b/examples/Makefile.in index fb95fd4..4f5e3ef 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -135,9 +135,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -145,7 +145,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 848bd77..b184808 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -142,9 +142,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -152,7 +152,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 6591013..2f5c6c5 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -135,9 +135,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -145,7 +145,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 5c8d792..ebf988d 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -197,9 +197,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -207,7 +207,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index ca5b8e5..8f0a320 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -191,9 +191,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -201,7 +201,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index da9d96d..c259484 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -154,9 +154,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -164,7 +164,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 14dfb78..ff860d8 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -142,9 +142,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -152,7 +152,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 27afbac..8c0b9b1 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -138,9 +138,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -148,7 +148,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 8fd1052..42230d9 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -135,9 +135,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -145,7 +145,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index c8e4383..33e49dc 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -161,9 +161,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -171,7 +171,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 8ebea41..9c066a6 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -155,9 +155,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -165,7 +165,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 10c65d0..ffd9bf9 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -135,9 +135,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -145,7 +145,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 15b15a2..00e6ac2 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -142,9 +142,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -152,7 +152,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index fdecd77..8195549 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -135,9 +135,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -145,7 +145,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 67a789c..f00328f 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -164,9 +164,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -174,7 +174,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 7c43420..7aabb0f 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -163,9 +163,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -173,7 +173,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/src/Makefile.am b/hl/src/Makefile.am index 7fa633f..9ad3b8a 100644 --- a/hl/src/Makefile.am +++ b/hl/src/Makefile.am @@ -30,8 +30,4 @@ libhdf5_hl_la_SOURCES=H5LT.c H5TB.c H5IM.c H5DS.c H5PT.c H5LTparse.c H5LTanalyze # Public header files (to be installed) include_HEADERS=hdf5_hl.h H5IMpublic.h H5LTpublic.h H5TBpublic.h H5DSpublic.h H5PTpublic.h -# Automake naturally assumes that we want it to remove H5LTparse.c on distclean. -# Convince it otherwise. -distclean-compile: - include $(top_srcdir)/config/conclude.am diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 06eb14c..c60d657 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -162,9 +162,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -172,7 +172,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ @@ -430,6 +430,9 @@ libhdf5_hl.la: $(libhdf5_hl_la_OBJECTS) $(libhdf5_hl_la_DEPENDENCIES) mostlyclean-compile: -rm -f *.$(OBJEXT) +distclean-compile: + -rm -f *.tab.c + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5DS.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5IM.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5LT.Plo@am__quote@ @@ -670,10 +673,6 @@ uninstall-am: uninstall-includeHEADERS uninstall-info-am \ build-tests check-clean check-install check-p check-s check-vfd \ install-doc lib progs tests uninstall-doc _exec_check-s _test -# Automake naturally assumes that we want it to remove H5LTparse.c on distclean. -# Convince it otherwise. -distclean-compile: - # lib/progs/tests targets recurse into subdirectories. build-* targets # build files in this directory. build-lib: $(LIB) diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 1e28bc3..d2372b8 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -174,9 +174,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -184,7 +184,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index ec5ccb9..140039a 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -139,9 +139,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -149,7 +149,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 61875e4..7b4f65f 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -165,9 +165,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -175,7 +175,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/perform/Makefile.in b/perform/Makefile.in index 6e47515..11f0df7 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -192,9 +192,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -202,7 +202,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/src/Makefile.in b/src/Makefile.in index dc5430e..af7cec2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -200,9 +200,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -210,7 +210,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/test/Makefile.in b/test/Makefile.in index 8643049..a3a651d 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -420,9 +420,9 @@ F9XMODEXT = @F9XMODEXT@ F9XMODFLAG = @F9XMODFLAG@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@ FC = @FC@ -FCFLAGS = @FCFLAGS@ +FCFLAGS = @FCFLAGS@ @H5_FCFLAGS@ FCLIBS = @FCLIBS@ -FFLAGS = @FFLAGS@ @H5_FFLAGS@ +FFLAGS = @FFLAGS@ FILTERS = @FILTERS@ FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@ FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@ @@ -430,7 +430,7 @@ FSEARCH_DIRS = @FSEARCH_DIRS@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ H5_CXXFLAGS = @H5_CXXFLAGS@ -H5_FFLAGS = @H5_FFLAGS@ +H5_FCFLAGS = @H5_FCFLAGS@ H5_VERSION = @H5_VERSION@ HADDR_T = @HADDR_T@ HDF5_INTERFACES = @HDF5_INTERFACES@ diff --git a/test/hyperslab.c b/test/hyperslab.c index b954ace..cd85c3d 100644 --- a/test/hyperslab.c +++ b/test/hyperslab.c @@ -62,7 +62,9 @@ init_full(uint8_t *array, size_t nx, size_t ny, size_t nz) for (j=0; j