summaryrefslogtreecommitdiffstats
path: root/tools/h5jam
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2009-07-23 20:04:18 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2009-07-23 20:04:18 (GMT)
commit6a00b1b6ffe86872088f92f38c98ccd6599d3c6c (patch)
treebab50938ed33e313d37c381b1769ff2a95f15502 /tools/h5jam
parent3a8bce5cb845685b9cfb7267ad6addc155dea567 (diff)
downloadhdf5-6a00b1b6ffe86872088f92f38c98ccd6599d3c6c.zip
hdf5-6a00b1b6ffe86872088f92f38c98ccd6599d3c6c.tar.gz
hdf5-6a00b1b6ffe86872088f92f38c98ccd6599d3c6c.tar.bz2
[svn-r17228] Purpose:
Fix BZ #1583 Description: The --enable-static-exec flag was broken. Configure was adding the -all-static linker flag to an environment variable which was subsequently never used. (looks like it was used in 1.6 Makefile.ins, but never moved to 1.8's Makefile.ams when we added automake support). To fix, I've added this environment varibale to the link lines of all the tools. Now, when --enable-static-exec is invoked, it will correctly generate statically linked executables in the installed bin directory. Tested: I've tested manually to ensure that the generated execs are static when the flag is used and dynamic when not. I've also tested when szip is used, as this was a use case mentioned in the bug report. Also: ran full tests with make check on jam and smirom for good measure.
Diffstat (limited to 'tools/h5jam')
-rw-r--r--tools/h5jam/Makefile.am4
-rw-r--r--tools/h5jam/Makefile.in14
2 files changed, 16 insertions, 2 deletions
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 87d1c6b..f2dec7d 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -74,6 +74,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)
@@ -82,6 +85,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)
@@ -358,6 +364,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)
@@ -455,13 +465,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)