summaryrefslogtreecommitdiffstats
path: root/tools/h5jam/Makefile.in
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2008-10-15 21:53:36 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2008-10-15 21:53:36 (GMT)
commit97cced22b65a7cea43ce772b252d5a7ed670edc7 (patch)
treea1a9dac4ad2978b1894adfe28ff6de8ab6aacf07 /tools/h5jam/Makefile.in
parentb353fb8b5a51f8ba853df9512d7ab57e66f86395 (diff)
downloadhdf5-97cced22b65a7cea43ce772b252d5a7ed670edc7.zip
hdf5-97cced22b65a7cea43ce772b252d5a7ed670edc7.tar.gz
hdf5-97cced22b65a7cea43ce772b252d5a7ed670edc7.tar.bz2
[svn-r15881] Purpose: Bug Fixes, Libtool Upgrade
Description: 1) configure now sets LD_LIBRARY_PATH before checking for presence of SZIP encoder, so user does not need to set this. The path is then saved and sent to Makefiles, and used when "make check-install" is invoked, so user doesn't need to set this manually. 2) Upgraded libtool to version 2.2.6a 3) Rearranged tools build order as h5dump depends on existence of h5diff and h5import. Since h5dump is a sister directory as opposed to a parent of either, it doesn't know about the build rules of these tools, so setting any sort of explicit dependency confuses automake as it won't know how to build the tools. Instead, setting CONFIG = ordered forces an in-order traversal of each tools subdirectory. (without it will also traverse in order by default, but this should prevent gmake's -j option from jumping ahead as well). 'make check install' should now be able to be invoked after 'configure' without causing a dependency failure. 4) Removed H5_HAVE_LARGE_HSIZET macro from vms/src/h5pubconf.h, as this macro has now been out of the code for some time. (vms pubconf needs to be updated manually, which is why it was still hanging around). Tested: kagiso, smirom, liberty Note: h5diff looks to be causing failures in h5copy and h5dump tools tests, though these were present before any of my changes. My changes only affect build order and configuration setup, and shouldn't prevent fixes for these failures coming in after this checkin. Other than these, tests pass fine.
Diffstat (limited to 'tools/h5jam/Makefile.in')
-rw-r--r--tools/h5jam/Makefile.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index ef9cfe4..5dfb94b 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -194,6 +194,8 @@ LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LINUX_LFS = @LINUX_LFS@
+LIPO = @LIPO@
+LL_PATH = @LL_PATH@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_STATIC_EXEC = @LT_STATIC_EXEC@
@@ -204,8 +206,11 @@ MPE = @MPE@
MPI_GET_SIZE = @MPI_GET_SIZE@
NM = @NM@
NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
OBJECT_NAMELEN_DEFAULT_F = @OBJECT_NAMELEN_DEFAULT_F@
OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@