diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-10-24 17:19:34 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2008-10-24 17:19:34 (GMT) |
| commit | a66427462495807c39be4eb48d7015253b9e8853 (patch) | |
| tree | 917da048f0d071652d31232d4ede3a82c01df7af /examples/Makefile.in | |
| parent | 220c8585e1af4bcff9595ff1506ad90b8c4a4736 (diff) | |
| download | hdf5-a66427462495807c39be4eb48d7015253b9e8853.zip hdf5-a66427462495807c39be4eb48d7015253b9e8853.tar.gz hdf5-a66427462495807c39be4eb48d7015253b9e8853.tar.bz2 | |
[svn-r15942] Purpose: Bug Fixes and Libtool Upgrade
Description:
- Remove need to set LD_LIBRARY_PATH when using shared szip library.
- Libtool 2.2.6a is now used to generate libraries.
- 'make check install' dependency bug is fixed, and should no longer
break the build.
- removed hard coding of shell in config/commence.am, as this causes
problems on Solaris with the new version of libtool.
- RELEASE.txt with appropriate changes.
Tested:
- kagiso, smirom, linew (merged from 1.8, pretty quick tests)
Diffstat (limited to 'examples/Makefile.in')
| -rw-r--r-- | examples/Makefile.in | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/examples/Makefile.in b/examples/Makefile.in index 9e4dfc3..ae26cdb 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -159,6 +159,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@ @@ -169,8 +171,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@ @@ -191,12 +196,7 @@ SEARCH = @SEARCH@ SED = @SED@ SETX = @SETX@ SET_MAKE = @SET_MAKE@ - -# Hardcode SHELL to be /bin/sh. Most machines have this shell, and -# on at least one machine configure fails to detect its existence (janus). -# Also, when HDF5 is configured on one machine but run on another, -# configure's automatic SHELL detection may not work on the build machine. -SHELL = /bin/sh +SHELL = @SHELL@ SIZE_T = @SIZE_T@ STATIC_EXEC = @STATIC_EXEC@ STATIC_SHARED = @STATIC_SHARED@ @@ -590,6 +590,8 @@ h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS) h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS) h5_shared_mesg: $(srcdir)/h5_shared_mesg.c +@BUILD_SZIP_CONDITIONAL_TRUE@export LD_LIBRARY_PATH=$(LL_PATH) + # How to create EXAMPLEDIR if it doesn't already exist $(EXAMPLEDIR): -$(top_srcdir)/bin/mkdirs $@ |