diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-15 17:08:41 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-15 17:08:41 (GMT) |
| commit | dd4360dccfda32f477192bd4a4ee22ee24585cf0 (patch) | |
| tree | 1a6d58a5ddaa88dfdac2e558e0ea65f38da73581 /config/commence.am | |
| parent | 2a2a49f42280220ad7cf2c45b1e5103d3b72146a (diff) | |
| download | hdf5-dd4360dccfda32f477192bd4a4ee22ee24585cf0.zip hdf5-dd4360dccfda32f477192bd4a4ee22ee24585cf0.tar.gz hdf5-dd4360dccfda32f477192bd4a4ee22ee24585cf0.tar.bz2 | |
[svn-r17645] Purpose:
Merge from Trunk
Description:
Merging all of my CFLAGS-related changes from trunk to 1.8
This includes revision #s: 17616, 17625, 17627, 17639, and 17643.
Tested:
h5committest and some additional checks on our FreeBSD as well
as NCSA's machines.
Diffstat (limited to 'config/commence.am')
| -rw-r--r-- | config/commence.am | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/config/commence.am b/config/commence.am index e5e4de9..667dbb2 100644 --- a/config/commence.am +++ b/config/commence.am @@ -55,13 +55,15 @@ H5FC_PP=$(bindir)/h5pfc H5CPP=$(bindir)/h5c++ -# 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@ -CPPFLAGS=@CPPFLAGS@ @H5_CPPFLAGS@ -FCFLAGS=@FCFLAGS@ @H5_FCFLAGS@ -CXXFLAGS=@CXXFLAGS@ @H5_CXXFLAGS@ +# H5_CFLAGS holds flags that should be used when building hdf5, +# but which should not be exported to h5cc for building other programs. +# AM_CFLAGS is an automake construct which should be used by Makefiles +# instead of CFLAGS, as CFLAGS is reserved solely for the user to define. + +AM_CFLAGS=@AM_CFLAGS@ @H5_CFLAGS@ +AM_FCFLAGS=@AM_FCFLAGS@ @H5_FCFLAGS@ +AM_CXXFLAGS=@AM_CXXFLAGS@ @H5_CXXFLAGS@ +AM_CPPFLAGS=@AM_CPPFLAGS@ @H5_CPPFLAGS@ # The trace script; this is used on source files from the C library to # insert tracing macros. |