[svn-r17441] Purpose:

    Merge from trunk

Description:

    Merged revisions 17228 and 17440 from trunk to 1.8

    Specifically, this brings support of --enable-static-exec flag into 1.8

Tested:

    Manually on jam, linew, smirom, liberty, plus h5committest.

    Currently, there is no automatic regression test that exists due to
    portability issues. Behavior is both different and undefined on certain
    systems (and while 'nm' command seems to exist on all machines, behavior
    is confirmed to be different on Mac, possibly others). Solution will be 
    to set up some sort of framework in daily tests to build statically, 
    remove shared paths, and verify executables can function.

18 files changed, 108 insertions, 12 deletions

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)