summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure100
-rw-r--r--configure.in45
-rw-r--r--hl/tools/gif2h5/Makefile.am4
-rw-r--r--hl/tools/gif2h5/Makefile.in14
-rw-r--r--perform/Makefile.am4
-rw-r--r--perform/Makefile.in14
-rw-r--r--release_docs/RELEASE.txt4
-rw-r--r--tools/h5copy/Makefile.am3
-rw-r--r--tools/h5copy/Makefile.in8
-rw-r--r--tools/h5diff/Makefile.am3
-rw-r--r--tools/h5diff/Makefile.in8
-rw-r--r--tools/h5dump/Makefile.am3
-rw-r--r--tools/h5dump/Makefile.in8
-rw-r--r--tools/h5import/Makefile.am3
-rwxr-xr-xtools/h5import/Makefile.in8
-rw-r--r--tools/h5jam/Makefile.am4
-rw-r--r--tools/h5jam/Makefile.in14
-rw-r--r--tools/h5ls/Makefile.am3
-rw-r--r--tools/h5ls/Makefile.in8
-rw-r--r--tools/h5repack/Makefile.am3
-rw-r--r--tools/h5repack/Makefile.in8
-rw-r--r--tools/h5stat/Makefile.am3
-rw-r--r--tools/h5stat/Makefile.in8
-rw-r--r--tools/misc/Makefile.am5
-rw-r--r--tools/misc/Makefile.in20
25 files changed, 222 insertions, 83 deletions
diff --git a/configure b/configure
index 2ea674e..1c8896e 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Id: configure.in 17437 2009-08-30 21:45:54Z lrknox .
+# From configure.in Id: configure.in 17439 2009-08-31 15:28:10Z mamcgree .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.64 for HDF5 1.8.3-snap9.
#
@@ -794,6 +794,7 @@ LL_PATH
USE_FILTER_SZIP
USE_FILTER_DEFLATE
AM_MAKEFLAGS
+LT_STATIC_EXEC
CPP
OTOOL64
OTOOL
@@ -825,7 +826,6 @@ TIME
TR
AR
PERL
-LT_STATIC_EXEC
CXXCPP
am__fastdepCXX_FALSE
am__fastdepCXX_TRUE
@@ -971,13 +971,13 @@ enable_maintainer_mode
enable_dependency_tracking
enable_fortran
enable_cxx
-enable_static_exec
enable_shared
enable_static
with_pic
enable_fast_install
with_gnu_ld
enable_libtool_lock
+enable_static_exec
enable_sharedlib_rpath
enable_production
enable_linux_lfs
@@ -1650,13 +1650,13 @@ Optional Features:
--enable-dependency-tracking do not reject slow dependency extractors
--enable-fortran Compile the Fortran interface [default=no]
--enable-cxx Compile the C++ interface [default=no]
- --enable-static-exec Build only statically linked executables
- [default=no]
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
+ --enable-static-exec Install only statically linked executables
+ [default=no]
--disable-sharedlib-rpath
Disable use of the '=Wl,-rpath' linker option
--enable-production Determines how to run the compiler.
@@ -7131,23 +7131,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if should build only statically linked executables" >&5
-$as_echo_n "checking if should build only statically linked executables... " >&6; }
-# Check whether --enable-static_exec was given.
-if test "${enable_static_exec+set}" = set; then :
- enableval=$enable_static_exec; STATIC_EXEC=$enableval
-fi
-
-
-if test "X$STATIC_EXEC" = "Xyes"; then
- echo "yes"
- LT_STATIC_EXEC="-all-static"
-else
- echo "no"
- LT_STATIC_EXEC=""
-fi
-
-
PERL=""
if test "X$GCC" = "Xyes"; then
for ac_prog in perl
@@ -8210,13 +8193,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:8213: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:8196: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:8216: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:8199: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:8219: output\"" >&5)
+ (eval echo "\"\$as_me:8202: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -9421,7 +9404,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9424 "configure"' > conftest.$ac_ext
+ echo '#line 9407 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -11741,11 +11724,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11744: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11727: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11748: \$? = $ac_status" >&5
+ echo "$as_me:11731: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12080,11 +12063,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12083: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12066: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12087: \$? = $ac_status" >&5
+ echo "$as_me:12070: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12185,11 +12168,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12188: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12171: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12192: \$? = $ac_status" >&5
+ echo "$as_me:12175: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12240,11 +12223,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12243: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12226: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12247: \$? = $ac_status" >&5
+ echo "$as_me:12230: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14671,7 +14654,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 14674 "configure"
+#line 14657 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14767,7 +14750,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 14770 "configure"
+#line 14753 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16739,11 +16722,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16742: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16725: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16746: \$? = $ac_status" >&5
+ echo "$as_me:16729: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16838,11 +16821,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16841: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16824: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16845: \$? = $ac_status" >&5
+ echo "$as_me:16828: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16890,11 +16873,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16893: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16876: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16897: \$? = $ac_status" >&5
+ echo "$as_me:16880: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18407,11 +18390,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18410: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18393: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18414: \$? = $ac_status" >&5
+ echo "$as_me:18397: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18506,11 +18489,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18509: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18492: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18513: \$? = $ac_status" >&5
+ echo "$as_me:18496: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18558,11 +18541,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18561: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18544: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18565: \$? = $ac_status" >&5
+ echo "$as_me:18548: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -20457,6 +20440,27 @@ EOF
;;
esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should install only statically linked executables" >&5
+$as_echo_n "checking if we should install only statically linked executables... " >&6; }
+# Check whether --enable-static_exec was given.
+if test "${enable_static_exec+set}" = set; then :
+ enableval=$enable_static_exec; STATIC_EXEC=$enableval
+fi
+
+
+if test "X$STATIC_EXEC" = "Xyes"; then
+ echo "yes"
+ if test "X$lt_cv_prog_compiler_static_works" = "Xno"; then
+ echo " warning: -static flag not supported on this system; executable won't statically link shared system libraries."
+ fi
+ LT_STATIC_EXEC="-all-static"
+else
+ echo "no"
+ LT_STATIC_EXEC=""
+fi
+
+
+
case "$INSTALL" in
*install-sh*)
INSTALL='\${top_srcdir}/bin/install-sh -c'
diff --git a/configure.in b/configure.in
index 9ae6ae9..f81750e 100644
--- a/configure.in
+++ b/configure.in
@@ -565,25 +565,6 @@ dnl Change back to the C language
AC_LANG_POP(C++)
dnl ----------------------------------------------------------------------
-dnl If we should build only static executables
-dnl
-AC_MSG_CHECKING([if should build only statically linked executables])
-AC_ARG_ENABLE([static_exec],
- [AC_HELP_STRING([--enable-static-exec],
- [Build only statically linked executables
- [default=no]])],
- [STATIC_EXEC=$enableval])
-
-if test "X$STATIC_EXEC" = "Xyes"; then
- echo "yes"
- LT_STATIC_EXEC="-all-static"
-else
- echo "no"
- LT_STATIC_EXEC=""
-fi
-AC_SUBST([LT_STATIC_EXEC])
-
-dnl ----------------------------------------------------------------------
dnl Check if they have Perl installed on their system. We only need Perl
dnl if they're using a GNU compiler.
dnl
@@ -993,6 +974,32 @@ EOF
;;
esac
+dnl ----------------------------------------------------------------------
+dnl Check if we should install only statically linked executables.
+dnl This check needs to occur after libtool is initialized because
+dnl we check a libtool cache value and may issue a warning based
+dnl on its result.
+AC_MSG_CHECKING([if we should install only statically linked executables])
+AC_ARG_ENABLE([static_exec],
+ [AC_HELP_STRING([--enable-static-exec],
+ [Install only statically linked executables
+ [default=no]])],
+ [STATIC_EXEC=$enableval])
+
+if test "X$STATIC_EXEC" = "Xyes"; then
+ echo "yes"
+ dnl Issue a warning if -static flag is not supported.
+ if test "X$lt_cv_prog_compiler_static_works" = "Xno"; then
+ echo " warning: -static flag not supported on this system; executable won't statically link shared system libraries."
+ fi
+ LT_STATIC_EXEC="-all-static"
+else
+ echo "no"
+ LT_STATIC_EXEC=""
+fi
+
+AC_SUBST([LT_STATIC_EXEC])
+
dnl Fix up the INSTALL macro if it's a relative path. We want the
dnl full-path to the binary instead.
case "$INSTALL" in
diff --git a/hl/tools/gif2h5/Makefile.am b/hl/tools/gif2h5/Makefile.am
index 076b915..f1cec06 100644
--- a/hl/tools/gif2h5/Makefile.am
+++ b/hl/tools/gif2h5/Makefile.am
@@ -31,6 +31,10 @@ check_SCRIPTS=$(TEST_SCRIPT)
bin_PROGRAMS=gif2h5 h52gif
noinst_PROGRAMS=h52gifgentst
+# Add h52gif and gif2h5 specific linker flags here
+h52gif_LDFLAGS = $(LT_STATIC_EXEC)
+gif2h5_LDFLAGS = $(LT_STATIC_EXEC)
+
gif2h5_SOURCES=gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c
h52gif_SOURCES=hdf2gif.c hdfgifwr.c
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 425dc42..71a16c4 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -73,10 +73,16 @@ am_gif2h5_OBJECTS = gif2hdf.$(OBJEXT) gif2mem.$(OBJEXT) \
gif2h5_OBJECTS = $(am_gif2h5_OBJECTS)
gif2h5_LDADD = $(LDADD)
gif2h5_DEPENDENCIES = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5)
+gif2h5_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gif2h5_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_h52gif_OBJECTS = hdf2gif.$(OBJEXT) hdfgifwr.$(OBJEXT)
h52gif_OBJECTS = $(am_h52gif_OBJECTS)
h52gif_LDADD = $(LDADD)
h52gif_DEPENDENCIES = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5)
+h52gif_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h52gif_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_h52gifgentst_OBJECTS = h52gifgentst.$(OBJEXT)
h52gifgentst_OBJECTS = $(am_h52gifgentst_OBJECTS)
h52gifgentst_LDADD = $(LDADD)
@@ -359,6 +365,10 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src
# These are our main targets, the tools
TEST_SCRIPT = $(srcdir)/h52giftest.sh
check_SCRIPTS = $(TEST_SCRIPT)
+
+# Add h52gif and gif2h5 specific linker flags here
+h52gif_LDFLAGS = $(LT_STATIC_EXEC)
+gif2h5_LDFLAGS = $(LT_STATIC_EXEC)
gif2h5_SOURCES = gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c
h52gif_SOURCES = hdf2gif.c hdfgifwr.c
h52gifgentst_SOURCES = h52gifgentst.c
@@ -470,10 +480,10 @@ clean-noinstPROGRAMS:
rm -f $$list
gif2h5$(EXEEXT): $(gif2h5_OBJECTS) $(gif2h5_DEPENDENCIES)
@rm -f gif2h5$(EXEEXT)
- $(LINK) $(gif2h5_OBJECTS) $(gif2h5_LDADD) $(LIBS)
+ $(gif2h5_LINK) $(gif2h5_OBJECTS) $(gif2h5_LDADD) $(LIBS)
h52gif$(EXEEXT): $(h52gif_OBJECTS) $(h52gif_DEPENDENCIES)
@rm -f h52gif$(EXEEXT)
- $(LINK) $(h52gif_OBJECTS) $(h52gif_LDADD) $(LIBS)
+ $(h52gif_LINK) $(h52gif_OBJECTS) $(h52gif_LDADD) $(LIBS)
h52gifgentst$(EXEEXT): $(h52gifgentst_OBJECTS) $(h52gifgentst_DEPENDENCIES)
@rm -f h52gifgentst$(EXEEXT)
$(LINK) $(h52gifgentst_OBJECTS) $(h52gifgentst_LDADD) $(LIBS)
diff --git a/perform/Makefile.am b/perform/Makefile.am
index 603175d..255275e 100644
--- a/perform/Makefile.am
+++ b/perform/Makefile.am
@@ -30,6 +30,10 @@ else
bin_PROGRAMS=h5perf_serial
endif
+# Add h5perf and h5perf_serial specific linker flags here
+h5perf_LDFLAGS = $(LT_STATIC_EXEC)
+h5perf_serial_LDFLAGS = $(LT_STATIC_EXEC)
+
# Some programs are not built or run by default, but can be built by hand or by
# specifying --enable-build-all at configure time.
# Also, some of these programs should only be built in parallel.
diff --git a/perform/Makefile.in b/perform/Makefile.in
index 4d1c7ed..355b732 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -90,10 +90,16 @@ am_h5perf_OBJECTS = pio_perf.$(OBJEXT) pio_engine.$(OBJEXT) \
pio_timer.$(OBJEXT)
h5perf_OBJECTS = $(am_h5perf_OBJECTS)
h5perf_DEPENDENCIES = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
+h5perf_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5perf_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_h5perf_serial_OBJECTS = sio_perf.$(OBJEXT) sio_engine.$(OBJEXT) \
sio_timer.$(OBJEXT)
h5perf_serial_OBJECTS = $(am_h5perf_serial_OBJECTS)
h5perf_serial_DEPENDENCIES = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
+h5perf_serial_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(h5perf_serial_LDFLAGS) $(LDFLAGS) -o $@
iopipe_SOURCES = iopipe.c
iopipe_OBJECTS = iopipe.$(OBJEXT)
iopipe_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5)
@@ -391,6 +397,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = h5perf perf
+# Add h5perf and h5perf_serial specific linker flags here
+h5perf_LDFLAGS = $(LT_STATIC_EXEC)
+h5perf_serial_LDFLAGS = $(LT_STATIC_EXEC)
+
# Some programs are not built or run by default, but can be built by hand or by
# specifying --enable-build-all at configure time.
# Also, some of these programs should only be built in parallel.
@@ -526,10 +536,10 @@ chunk$(EXEEXT): $(chunk_OBJECTS) $(chunk_DEPENDENCIES)
$(LINK) $(chunk_OBJECTS) $(chunk_LDADD) $(LIBS)
h5perf$(EXEEXT): $(h5perf_OBJECTS) $(h5perf_DEPENDENCIES)
@rm -f h5perf$(EXEEXT)
- $(LINK) $(h5perf_OBJECTS) $(h5perf_LDADD) $(LIBS)
+ $(h5perf_LINK) $(h5perf_OBJECTS) $(h5perf_LDADD) $(LIBS)
h5perf_serial$(EXEEXT): $(h5perf_serial_OBJECTS) $(h5perf_serial_DEPENDENCIES)
@rm -f h5perf_serial$(EXEEXT)
- $(LINK) $(h5perf_serial_OBJECTS) $(h5perf_serial_LDADD) $(LIBS)
+ $(h5perf_serial_LINK) $(h5perf_serial_OBJECTS) $(h5perf_serial_LDADD) $(LIBS)
iopipe$(EXEEXT): $(iopipe_OBJECTS) $(iopipe_DEPENDENCIES)
@rm -f iopipe$(EXEEXT)
$(LINK) $(iopipe_OBJECTS) $(iopipe_LDADD) $(LIBS)
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 3a5375f..1202707 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -97,6 +97,10 @@ Bug Fixes since HDF5-1.8.3
Configuration
-------------
+ - The --enable-static-exec flag has been fixed and will now install
+ statically-linked executables within the install directory when used
+ on systems that support the -static linker flag.
+ MAM - 2009/08/31 - BZ #1583
- The PathScale compiler (v3.2) was mistaken as gcc v4.2.0 but it fails to
recognize some gcc options. Fixed. (see bug 1301). AKC - 2009/7/28 -
diff --git a/tools/h5copy/Makefile.am b/tools/h5copy/Makefile.am
index 23432eb..1848972 100644
--- a/tools/h5copy/Makefile.am
+++ b/tools/h5copy/Makefile.am
@@ -33,6 +33,9 @@ SCRIPT_DEPEND=h5copy$(EXEEXT)
bin_PROGRAMS=h5copy
check_PROGRAMS=$(TEST_PROG)
+# Add h5copy specific linker flags here
+h5copy_LDFLAGS = $(LT_STATIC_EXEC)
+
# source file for the test file generator
h5copygentest_SOURCES=h5copygentest.c
diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in
index 2ffcd87..b582057 100644
--- a/tools/h5copy/Makefile.in
+++ b/tools/h5copy/Makefile.in
@@ -73,6 +73,9 @@ h5copy_SOURCES = h5copy.c
h5copy_OBJECTS = h5copy.$(OBJEXT)
h5copy_LDADD = $(LDADD)
h5copy_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5copy_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5copy_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_h5copygentest_OBJECTS = h5copygentest.$(OBJEXT)
h5copygentest_OBJECTS = $(am_h5copygentest_OBJECTS)
h5copygentest_LDADD = $(LDADD)
@@ -360,6 +363,9 @@ TEST_SCRIPT = $(srcdir)/testh5copy.sh
check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5copy$(EXEEXT)
+# Add h5copy specific linker flags here
+h5copy_LDFLAGS = $(LT_STATIC_EXEC)
+
# source file for the test file generator
h5copygentest_SOURCES = h5copygentest.c
@@ -469,7 +475,7 @@ clean-checkPROGRAMS:
rm -f $$list
h5copy$(EXEEXT): $(h5copy_OBJECTS) $(h5copy_DEPENDENCIES)
@rm -f h5copy$(EXEEXT)
- $(LINK) $(h5copy_OBJECTS) $(h5copy_LDADD) $(LIBS)
+ $(h5copy_LINK) $(h5copy_OBJECTS) $(h5copy_LDADD) $(LIBS)
h5copygentest$(EXEEXT): $(h5copygentest_OBJECTS) $(h5copygentest_DEPENDENCIES)
@rm -f h5copygentest$(EXEEXT)
$(LINK) $(h5copygentest_OBJECTS) $(h5copygentest_LDADD) $(LIBS)
diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am
index ed1d106..b56284b 100644
--- a/tools/h5diff/Makefile.am
+++ b/tools/h5diff/Makefile.am
@@ -33,6 +33,9 @@ endif
# Our main target, h5diff
bin_PROGRAMS=h5diff $(H5PDIFF)
+# Add h5diff specific linker flags here
+h5diff_LDFLAGS = $(LT_STATIC_EXEC)
+
# Test programs and scripts
TEST_PROG=h5diffgentest
TEST_SCRIPT=$(srcdir)/testh5diff.sh
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index bef40eb..91add70 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -74,6 +74,9 @@ am_h5diff_OBJECTS = h5diff_main.$(OBJEXT) h5diff_common.$(OBJEXT)
h5diff_OBJECTS = $(am_h5diff_OBJECTS)
h5diff_LDADD = $(LDADD)
h5diff_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5diff_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5diff_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_h5diffgentest_OBJECTS = h5diffgentest.$(OBJEXT)
h5diffgentest_OBJECTS = $(am_h5diffgentest_OBJECTS)
h5diffgentest_LDADD = $(LDADD)
@@ -367,6 +370,9 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@BUILD_PARALLEL_CONDITIONAL_TRUE@H5PDIFF = ph5diff
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_SCRIPT_PARA = $(srcdir)/testph5diff.sh
+# Add h5diff specific linker flags here
+h5diff_LDFLAGS = $(LT_STATIC_EXEC)
+
# Test programs and scripts
TEST_PROG = h5diffgentest
TEST_SCRIPT = $(srcdir)/testh5diff.sh
@@ -485,7 +491,7 @@ clean-checkPROGRAMS:
rm -f $$list
h5diff$(EXEEXT): $(h5diff_OBJECTS) $(h5diff_DEPENDENCIES)
@rm -f h5diff$(EXEEXT)
- $(LINK) $(h5diff_OBJECTS) $(h5diff_LDADD) $(LIBS)
+ $(h5diff_LINK) $(h5diff_OBJECTS) $(h5diff_LDADD) $(LIBS)
h5diffgentest$(EXEEXT): $(h5diffgentest_OBJECTS) $(h5diffgentest_DEPENDENCIES)
@rm -f h5diffgentest$(EXEEXT)
$(LINK) $(h5diffgentest_OBJECTS) $(h5diffgentest_LDADD) $(LIBS)
diff --git a/tools/h5dump/Makefile.am b/tools/h5dump/Makefile.am
index 599c203..992586b 100644
--- a/tools/h5dump/Makefile.am
+++ b/tools/h5dump/Makefile.am
@@ -34,6 +34,9 @@ SCRIPT_DEPEND=h5dump$(EXEEXT)
# Our main target, the h5dump tool.
bin_PROGRAMS=h5dump
+# Add h5dump specific linker flags here
+h5dump_LDFLAGS = $(LT_STATIC_EXEC)
+
# All the programs depend on the hdf5 and h5tools libraries
LDADD=$(LIBH5TOOLS) $(LIBHDF5)
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index 869fb87..be8cf96 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -78,6 +78,9 @@ h5dump_SOURCES = h5dump.c
h5dump_OBJECTS = h5dump.$(OBJEXT)
h5dump_LDADD = $(LDADD)
h5dump_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5dump_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5dump_LDFLAGS) \
+ $(LDFLAGS) -o $@
h5dumpgentest_SOURCES = h5dumpgentest.c
h5dumpgentest_OBJECTS = h5dumpgentest.$(OBJEXT)
h5dumpgentest_LDADD = $(LDADD)
@@ -365,6 +368,9 @@ TEST_SCRIPT = testh5dump.sh testh5dumpxml.sh
check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5dump$(EXEEXT)
+# Add h5dump specific linker flags here
+h5dump_LDFLAGS = $(LT_STATIC_EXEC)
+
# All the programs depend on the hdf5 and h5tools libraries
LDADD = $(LIBH5TOOLS) $(LIBHDF5)
DISTCLEANFILES = testh5dump.sh
@@ -479,7 +485,7 @@ binread$(EXEEXT): $(binread_OBJECTS) $(binread_DEPENDENCIES)
$(LINK) $(binread_OBJECTS) $(binread_LDADD) $(LIBS)
h5dump$(EXEEXT): $(h5dump_OBJECTS) $(h5dump_DEPENDENCIES)
@rm -f h5dump$(EXEEXT)
- $(LINK) $(h5dump_OBJECTS) $(h5dump_LDADD) $(LIBS)
+ $(h5dump_LINK) $(h5dump_OBJECTS) $(h5dump_LDADD) $(LIBS)
h5dumpgentest$(EXEEXT): $(h5dumpgentest_OBJECTS) $(h5dumpgentest_DEPENDENCIES)
@rm -f h5dumpgentest$(EXEEXT)
$(LINK) $(h5dumpgentest_OBJECTS) $(h5dumpgentest_LDADD) $(LIBS)
diff --git a/tools/h5import/Makefile.am b/tools/h5import/Makefile.am
index a88cb36..2202f5f 100644
--- a/tools/h5import/Makefile.am
+++ b/tools/h5import/Makefile.am
@@ -34,6 +34,9 @@ SCRIPT_DEPEND=h5import$(EXEEXT)
# Our main targets
bin_PROGRAMS=h5import
+# Add h5import specific linker flags here
+h5import_LDFLAGS = $(LT_STATIC_EXEC)
+
# All programs depend on the main hdf5 library and the tools library
LDADD=$(LIBH5TOOLS) $(LIBHDF5)
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 70a3477..f9e88ae 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -73,6 +73,9 @@ h5import_SOURCES = h5import.c
h5import_OBJECTS = h5import.$(OBJEXT)
h5import_LDADD = $(LDADD)
h5import_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5import_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5import_LDFLAGS) \
+ $(LDFLAGS) -o $@
h5importtest_SOURCES = h5importtest.c
h5importtest_OBJECTS = h5importtest.$(OBJEXT)
h5importtest_LDADD = $(LDADD)
@@ -357,6 +360,9 @@ TEST_SCRIPT = $(srcdir)/h5importtestutil.sh
check_SCRIPT = h5importtestutil.sh
SCRIPT_DEPEND = h5import$(EXEEXT)
+# Add h5import specific linker flags here
+h5import_LDFLAGS = $(LT_STATIC_EXEC)
+
# All programs depend on the main hdf5 library and the tools library
LDADD = $(LIBH5TOOLS) $(LIBHDF5)
@@ -463,7 +469,7 @@ clean-checkPROGRAMS:
rm -f $$list
h5import$(EXEEXT): $(h5import_OBJECTS) $(h5import_DEPENDENCIES)
@rm -f h5import$(EXEEXT)
- $(LINK) $(h5import_OBJECTS) $(h5import_LDADD) $(LIBS)
+ $(h5import_LINK) $(h5import_OBJECTS) $(h5import_LDADD) $(LIBS)
h5importtest$(EXEEXT): $(h5importtest_OBJECTS) $(h5importtest_DEPENDENCIES)
@rm -f h5importtest$(EXEEXT)
$(LINK) $(h5importtest_OBJECTS) $(h5importtest_LDADD) $(LIBS)
diff --git a/tools/h5jam/Makefile.am b/tools/h5jam/Makefile.am
index 2fd7e86..d89a2d2 100644
--- a/tools/h5jam/Makefile.am
+++ b/tools/h5jam/Makefile.am
@@ -27,6 +27,10 @@ bin_PROGRAMS=h5jam h5unjam
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)
+
check_SCRIPTS=$(TEST_SCRIPT)
SCRIPT_DEPEND=h5jam$(EXEEXT) h5unjam$(EXEEXT)
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 2e5ff5d..12486a0 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -76,6 +76,9 @@ h5jam_SOURCES = h5jam.c
h5jam_OBJECTS = h5jam.$(OBJEXT)
h5jam_LDADD = $(LDADD)
h5jam_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5jam_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5jam_LDFLAGS) \
+ $(LDFLAGS) -o $@
h5jamgentest_SOURCES = h5jamgentest.c
h5jamgentest_OBJECTS = h5jamgentest.$(OBJEXT)
h5jamgentest_LDADD = $(LDADD)
@@ -84,6 +87,9 @@ h5unjam_SOURCES = h5unjam.c
h5unjam_OBJECTS = h5unjam.$(OBJEXT)
h5unjam_LDADD = $(LDADD)
h5unjam_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5unjam_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5unjam_LDFLAGS) \
+ $(LDFLAGS) -o $@
tellub_SOURCES = tellub.c
tellub_OBJECTS = tellub.$(OBJEXT)
tellub_LDADD = $(LDADD)
@@ -365,6 +371,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.txt
# Include src and tools/lib directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
TEST_SCRIPT = testh5jam.sh
+
+# Add h5jam and h5unjam specific linker flags here
+h5jam_LDFLAGS = $(LT_STATIC_EXEC)
+h5unjam_LDFLAGS = $(LT_STATIC_EXEC)
check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5jam$(EXEEXT) h5unjam$(EXEEXT)
@@ -480,13 +490,13 @@ getub$(EXEEXT): $(getub_OBJECTS) $(getub_DEPENDENCIES)
$(LINK) $(getub_OBJECTS) $(getub_LDADD) $(LIBS)
h5jam$(EXEEXT): $(h5jam_OBJECTS) $(h5jam_DEPENDENCIES)
@rm -f h5jam$(EXEEXT)
- $(LINK) $(h5jam_OBJECTS) $(h5jam_LDADD) $(LIBS)
+ $(h5jam_LINK) $(h5jam_OBJECTS) $(h5jam_LDADD) $(LIBS)
h5jamgentest$(EXEEXT): $(h5jamgentest_OBJECTS) $(h5jamgentest_DEPENDENCIES)
@rm -f h5jamgentest$(EXEEXT)
$(LINK) $(h5jamgentest_OBJECTS) $(h5jamgentest_LDADD) $(LIBS)
h5unjam$(EXEEXT): $(h5unjam_OBJECTS) $(h5unjam_DEPENDENCIES)
@rm -f h5unjam$(EXEEXT)
- $(LINK) $(h5unjam_OBJECTS) $(h5unjam_LDADD) $(LIBS)
+ $(h5unjam_LINK) $(h5unjam_OBJECTS) $(h5unjam_LDADD) $(LIBS)
tellub$(EXEEXT): $(tellub_OBJECTS) $(tellub_DEPENDENCIES)
@rm -f tellub$(EXEEXT)
$(LINK) $(tellub_OBJECTS) $(tellub_LDADD) $(LIBS)
diff --git a/tools/h5ls/Makefile.am b/tools/h5ls/Makefile.am
index 439ef07..64e89f1 100644
--- a/tools/h5ls/Makefile.am
+++ b/tools/h5ls/Makefile.am
@@ -31,6 +31,9 @@ SCRIPT_DEPEND=h5ls$(EXEEXT)
# This is our main target, the h5ls tool
bin_PROGRAMS=h5ls
+# Add h5ls specific linker flags here
+h5ls_LDFLAGS = $(LT_STATIC_EXEC)
+
# All programs depend on the hdf5 and h5tools libraries
LDADD=$(LIBH5TOOLS) $(LIBHDF5)
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 9e5e930..bace577 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -71,6 +71,9 @@ h5ls_SOURCES = h5ls.c
h5ls_OBJECTS = h5ls.$(OBJEXT)
h5ls_LDADD = $(LDADD)
h5ls_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5ls_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5ls_LDFLAGS) \
+ $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
am__depfiles_maybe = depfiles
@@ -350,6 +353,9 @@ TEST_SCRIPT = testh5ls.sh
check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5ls$(EXEEXT)
+# Add h5ls specific linker flags here
+h5ls_LDFLAGS = $(LT_STATIC_EXEC)
+
# All programs depend on the hdf5 and h5tools libraries
LDADD = $(LIBH5TOOLS) $(LIBHDF5)
@@ -449,7 +455,7 @@ clean-binPROGRAMS:
rm -f $$list
h5ls$(EXEEXT): $(h5ls_OBJECTS) $(h5ls_DEPENDENCIES)
@rm -f h5ls$(EXEEXT)
- $(LINK) $(h5ls_OBJECTS) $(h5ls_LDADD) $(LIBS)
+ $(h5ls_LINK) $(h5ls_OBJECTS) $(h5ls_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am
index 2c0c0c2..1f811f0 100644
--- a/tools/h5repack/Makefile.am
+++ b/tools/h5repack/Makefile.am
@@ -36,6 +36,9 @@ SCRIPT_DEPEND=h5repack$(EXEEXT)
# Our main target, h5repack tool
bin_PROGRAMS=h5repack
+# Add h5repack specific linker flags here
+h5repack_LDFLAGS = $(LT_STATIC_EXEC)
+
# Depend on the hdf5 library, the tools library, the test library
LDADD=$(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index da47c95..656cfa6 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -78,6 +78,9 @@ am_h5repack_OBJECTS = $(am__objects_1) h5repack_main.$(OBJEXT)
h5repack_OBJECTS = $(am_h5repack_OBJECTS)
h5repack_LDADD = $(LDADD)
h5repack_DEPENDENCIES = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
+h5repack_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5repack_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_h5repacktst_OBJECTS = $(am__objects_1) h5repacktst.$(OBJEXT)
h5repacktst_OBJECTS = $(am_h5repacktst_OBJECTS)
h5repacktst_LDADD = $(LDADD)
@@ -374,6 +377,9 @@ TEST_PROG = h5repacktst
check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5repack$(EXEEXT)
+# Add h5repack specific linker flags here
+h5repack_LDFLAGS = $(LT_STATIC_EXEC)
+
# Depend on the hdf5 library, the tools library, the test library
LDADD = $(LIBH5TOOLS) $(LIBH5TEST) $(LIBHDF5)
@@ -501,7 +507,7 @@ clean-noinstPROGRAMS:
rm -f $$list
h5repack$(EXEEXT): $(h5repack_OBJECTS) $(h5repack_DEPENDENCIES)
@rm -f h5repack$(EXEEXT)
- $(LINK) $(h5repack_OBJECTS) $(h5repack_LDADD) $(LIBS)
+ $(h5repack_LINK) $(h5repack_OBJECTS) $(h5repack_LDADD) $(LIBS)
h5repacktst$(EXEEXT): $(h5repacktst_OBJECTS) $(h5repacktst_DEPENDENCIES)
@rm -f h5repacktst$(EXEEXT)
$(LINK) $(h5repacktst_OBJECTS) $(h5repacktst_LDADD) $(LIBS)
diff --git a/tools/h5stat/Makefile.am b/tools/h5stat/Makefile.am
index b1c2024..a14172d 100644
--- a/tools/h5stat/Makefile.am
+++ b/tools/h5stat/Makefile.am
@@ -35,6 +35,9 @@ SCRIPT_DEPEND=h5stat$(EXEEXT)
bin_PROGRAMS=h5stat
bin_SCRIPTS=
+# Add h5stat specific linker flags here
+h5stat_LDFLAGS = $(LT_STATIC_EXEC)
+
# Tell automake to clean h5redeploy script
CLEANFILES=
diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in
index 1fd860b..15b19ed 100644
--- a/tools/h5stat/Makefile.in
+++ b/tools/h5stat/Makefile.in
@@ -74,6 +74,9 @@ h5stat_SOURCES = h5stat.c
h5stat_OBJECTS = h5stat.$(OBJEXT)
h5stat_LDADD = $(LDADD)
h5stat_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5stat_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5stat_LDFLAGS) \
+ $(LDFLAGS) -o $@
h5stat_gentest_SOURCES = h5stat_gentest.c
h5stat_gentest_OBJECTS = h5stat_gentest.$(OBJEXT)
h5stat_gentest_LDADD = $(LDADD)
@@ -386,6 +389,9 @@ check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5stat$(EXEEXT)
bin_SCRIPTS =
+# Add h5stat specific linker flags here
+h5stat_LDFLAGS = $(LT_STATIC_EXEC)
+
# Tell automake to clean h5redeploy script
CLEANFILES =
@@ -500,7 +506,7 @@ clean-checkPROGRAMS:
rm -f $$list
h5stat$(EXEEXT): $(h5stat_OBJECTS) $(h5stat_DEPENDENCIES)
@rm -f h5stat$(EXEEXT)
- $(LINK) $(h5stat_OBJECTS) $(h5stat_LDADD) $(LIBS)
+ $(h5stat_LINK) $(h5stat_OBJECTS) $(h5stat_LDADD) $(LIBS)
h5stat_gentest$(EXEEXT): $(h5stat_gentest_OBJECTS) $(h5stat_gentest_DEPENDENCIES)
@rm -f h5stat_gentest$(EXEEXT)
$(LINK) $(h5stat_gentest_OBJECTS) $(h5stat_gentest_LDADD) $(LIBS)
diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am
index bf180f8..7f78465 100644
--- a/tools/misc/Makefile.am
+++ b/tools/misc/Makefile.am
@@ -35,6 +35,11 @@ SCRIPT_DEPEND=h5repart$(EXEEXT) h5mkgrp$(EXEEXT)
bin_PROGRAMS=h5debug h5repart h5mkgrp
bin_SCRIPTS=h5redeploy
+# Add h5debug, h5repart, and h5mkgrp specific linker flags here
+h5debug_LDFLAGS = $(LT_STATIC_EXEC)
+h5repart_LDFLAGS = $(LT_STATIC_EXEC)
+h5mkgrp_LDFLAGS = $(LT_STATIC_EXEC)
+
# Tell automake to clean h5redeploy script
CLEANFILES=h5redeploy
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 1ea2b78..dd8fce6 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -75,14 +75,23 @@ h5debug_SOURCES = h5debug.c
h5debug_OBJECTS = h5debug.$(OBJEXT)
h5debug_LDADD = $(LDADD)
h5debug_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5debug_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5debug_LDFLAGS) \
+ $(LDFLAGS) -o $@
h5mkgrp_SOURCES = h5mkgrp.c
h5mkgrp_OBJECTS = h5mkgrp.$(OBJEXT)
h5mkgrp_LDADD = $(LDADD)
h5mkgrp_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5mkgrp_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5mkgrp_LDFLAGS) \
+ $(LDFLAGS) -o $@
h5repart_SOURCES = h5repart.c
h5repart_OBJECTS = h5repart.$(OBJEXT)
h5repart_LDADD = $(LDADD)
h5repart_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5)
+h5repart_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5repart_LDFLAGS) \
+ $(LDFLAGS) -o $@
h5repart_gentest_SOURCES = h5repart_gentest.c
h5repart_gentest_OBJECTS = h5repart_gentest.$(OBJEXT)
h5repart_gentest_LDADD = $(LDADD)
@@ -401,6 +410,11 @@ check_SCRIPTS = $(TEST_SCRIPT)
SCRIPT_DEPEND = h5repart$(EXEEXT) h5mkgrp$(EXEEXT)
bin_SCRIPTS = h5redeploy
+# Add h5debug, h5repart, and h5mkgrp specific linker flags here
+h5debug_LDFLAGS = $(LT_STATIC_EXEC)
+h5repart_LDFLAGS = $(LT_STATIC_EXEC)
+h5mkgrp_LDFLAGS = $(LT_STATIC_EXEC)
+
# Tell automake to clean h5redeploy script
CLEANFILES = h5redeploy
@@ -522,13 +536,13 @@ clean-checkPROGRAMS:
rm -f $$list
h5debug$(EXEEXT): $(h5debug_OBJECTS) $(h5debug_DEPENDENCIES)
@rm -f h5debug$(EXEEXT)
- $(LINK) $(h5debug_OBJECTS) $(h5debug_LDADD) $(LIBS)
+ $(h5debug_LINK) $(h5debug_OBJECTS) $(h5debug_LDADD) $(LIBS)
h5mkgrp$(EXEEXT): $(h5mkgrp_OBJECTS) $(h5mkgrp_DEPENDENCIES)
@rm -f h5mkgrp$(EXEEXT)
- $(LINK) $(h5mkgrp_OBJECTS) $(h5mkgrp_LDADD) $(LIBS)
+ $(h5mkgrp_LINK) $(h5mkgrp_OBJECTS) $(h5mkgrp_LDADD) $(LIBS)
h5repart$(EXEEXT): $(h5repart_OBJECTS) $(h5repart_DEPENDENCIES)
@rm -f h5repart$(EXEEXT)
- $(LINK) $(h5repart_OBJECTS) $(h5repart_LDADD) $(LIBS)
+ $(h5repart_LINK) $(h5repart_OBJECTS) $(h5repart_LDADD) $(LIBS)
h5repart_gentest$(EXEEXT): $(h5repart_gentest_OBJECTS) $(h5repart_gentest_DEPENDENCIES)
@rm -f h5repart_gentest$(EXEEXT)
$(LINK) $(h5repart_gentest_OBJECTS) $(h5repart_gentest_LDADD) $(LIBS)
generated by cgit v0.12 at 2024-08-24 16:10:45 (GMT)