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/h5jam/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/h5jam/Makefile.am')
| -rw-r--r-- | tools/h5jam/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5jam/Makefile.am b/tools/h5jam/Makefile.am index d89a2d2..2f9bc00 100644 --- a/tools/h5jam/Makefile.am +++ b/tools/h5jam/Makefile.am @@ -28,8 +28,8 @@ check_PROGRAMS=tellub h5jamgentest getub TEST_SCRIPT=testh5jam.sh # Add h5jam and h5unjam specific linker flags here -h5jam_LDFLAGS = $(LT_STATIC_EXEC) -h5unjam_LDFLAGS = $(LT_STATIC_EXEC) +h5jam_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) +h5unjam_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) check_SCRIPTS=$(TEST_SCRIPT) SCRIPT_DEPEND=h5jam$(EXEEXT) h5unjam$(EXEEXT) |