[svn-r11421] Purpose:

Feature

Description:
Added H5_CFLAGS, etc. to 1.7 branch.
Now compilation flags can be put in H5_*FLAGS and they'll be used when
building hdf5 but not in h5cc.


Platforms tested:
mir, sleipnir, modi4

Misc. update:

4 files changed, 44 insertions, 16 deletions

diff --git a/c++/Makefile.in b/c++/Makefile.in
index 5a67161..9dd9234 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -104,16 +104,19 @@ BYTESEX = @BYTESEX@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
+
+# H5_CFLAGS holds flags that should be used as CFLAGS when building hdf5,
+# but which shouldn't be exported to h5cc for building other programs.
+CFLAGS = @CFLAGS@ @H5_CFLAGS@
 CONFIG_DATE = @CONFIG_DATE@
 CONFIG_MODE = @CONFIG_MODE@
 CONFIG_USER = @CONFIG_USER@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ @H5_CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@
 CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@
 CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@
 CYGPATH_W = @CYGPATH_W@
@@ -136,11 +139,15 @@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@
+FFLAGS = @FFLAGS@ @H5_FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
 FSEARCH_DIRS = @FSEARCH_DIRS@
+H5_CFLAGS = @H5_CFLAGS@
+H5_CPPFLAGS = @H5_CPPFLAGS@
+H5_CXXFLAGS = @H5_CXXFLAGS@
+H5_FFLAGS = @H5_FFLAGS@
 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 0dfa1fb..362bde2 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -96,16 +96,19 @@ BYTESEX = @BYTESEX@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
+
+# H5_CFLAGS holds flags that should be used as CFLAGS when building hdf5,
+# but which shouldn't be exported to h5cc for building other programs.
+CFLAGS = @CFLAGS@ @H5_CFLAGS@
 CONFIG_DATE = @CONFIG_DATE@
 CONFIG_MODE = @CONFIG_MODE@
 CONFIG_USER = @CONFIG_USER@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ @H5_CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@
 CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@
 CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@
 CYGPATH_W = @CYGPATH_W@
@@ -128,11 +131,15 @@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@
+FFLAGS = @FFLAGS@ @H5_FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
 FSEARCH_DIRS = @FSEARCH_DIRS@
+H5_CFLAGS = @H5_CFLAGS@
+H5_CPPFLAGS = @H5_CPPFLAGS@
+H5_CXXFLAGS = @H5_CXXFLAGS@
+H5_FFLAGS = @H5_FFLAGS@
 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 fdc5e87..342a82d 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -138,16 +138,19 @@ BYTESEX = @BYTESEX@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
+
+# H5_CFLAGS holds flags that should be used as CFLAGS when building hdf5,
+# but which shouldn't be exported to h5cc for building other programs.
+CFLAGS = @CFLAGS@ @H5_CFLAGS@
 CONFIG_DATE = @CONFIG_DATE@
 CONFIG_MODE = @CONFIG_MODE@
 CONFIG_USER = @CONFIG_USER@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ @H5_CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@
 CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@
 CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@
 CYGPATH_W = @CYGPATH_W@
@@ -170,11 +173,15 @@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@
+FFLAGS = @FFLAGS@ @H5_FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
 FSEARCH_DIRS = @FSEARCH_DIRS@
+H5_CFLAGS = @H5_CFLAGS@
+H5_CPPFLAGS = @H5_CPPFLAGS@
+H5_CXXFLAGS = @H5_CXXFLAGS@
+H5_FFLAGS = @H5_FFLAGS@
 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 6990f59..68d51b1 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -127,16 +127,19 @@ BYTESEX = @BYTESEX@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CC_VERSION = @CC_VERSION@
-CFLAGS = @CFLAGS@
+
+# H5_CFLAGS holds flags that should be used as CFLAGS when building hdf5,
+# but which shouldn't be exported to h5cc for building other programs.
+CFLAGS = @CFLAGS@ @H5_CFLAGS@
 CONFIG_DATE = @CONFIG_DATE@
 CONFIG_MODE = @CONFIG_MODE@
 CONFIG_USER = @CONFIG_USER@
 CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
+CPPFLAGS = @CPPFLAGS@ @H5_CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
+CXXFLAGS = @CXXFLAGS@ @H5_CXXFLAGS@
 CXX_SHARED_CONDITIONAL_FALSE = @CXX_SHARED_CONDITIONAL_FALSE@
 CXX_SHARED_CONDITIONAL_TRUE = @CXX_SHARED_CONDITIONAL_TRUE@
 CYGPATH_W = @CYGPATH_W@
@@ -159,11 +162,15 @@ F9XSUFFIXFLAG = @F9XSUFFIXFLAG@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
 FCLIBS = @FCLIBS@
-FFLAGS = @FFLAGS@
+FFLAGS = @FFLAGS@ @H5_FFLAGS@
 FILTERS = @FILTERS@
 FORTRAN_SHARED_CONDITIONAL_FALSE = @FORTRAN_SHARED_CONDITIONAL_FALSE@
 FORTRAN_SHARED_CONDITIONAL_TRUE = @FORTRAN_SHARED_CONDITIONAL_TRUE@
 FSEARCH_DIRS = @FSEARCH_DIRS@
+H5_CFLAGS = @H5_CFLAGS@
+H5_CPPFLAGS = @H5_CPPFLAGS@
+H5_CXXFLAGS = @H5_CXXFLAGS@
+H5_FFLAGS = @H5_FFLAGS@
 H5_VERSION = @H5_VERSION@
 HADDR_T = @HADDR_T@
 HDF5_INTERFACES = @HDF5_INTERFACES@