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 /c++/test/Makefile.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 'c++/test/Makefile.am')
-rw-r--r-- | c++/test/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am index 058f925..7799fd6 100644 --- a/c++/test/Makefile.am +++ b/c++/test/Makefile.am @@ -26,7 +26,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src # Shared C++ libraries aren't universally supported. if CXX_SHARED_CONDITIONAL else - AM_LDFLAGS=-static + AM_LDFLAGS+=-static endif # These are our main targets. They should be listed in the order to be |