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 /tools/h5ls/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 'tools/h5ls/Makefile.am')
-rw-r--r-- | tools/h5ls/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/h5ls/Makefile.am b/tools/h5ls/Makefile.am index 64e89f1..41e66f6 100644 --- a/tools/h5ls/Makefile.am +++ b/tools/h5ls/Makefile.am @@ -32,7 +32,7 @@ SCRIPT_DEPEND=h5ls$(EXEEXT) bin_PROGRAMS=h5ls # Add h5ls specific linker flags here -h5ls_LDFLAGS = $(LT_STATIC_EXEC) +h5ls_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) # All programs depend on the hdf5 and h5tools libraries LDADD=$(LIBH5TOOLS) $(LIBHDF5) |