summaryrefslogtreecommitdiffstats
path: root/tools/h5repack
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2009-08-31 18:38:17 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2009-08-31 18:38:17 (GMT)
commit3c0de7fb0cb1fdcc83bf376be6aead3abcc49e6e (patch)
treeb06170309bdc41e49843a6a7a66b94bb03bb43e5 /tools/h5repack
parentee3ed7a67ff8a3d8a3ce2dac4e6942724ba33c85 (diff)
downloadhdf5-3c0de7fb0cb1fdcc83bf376be6aead3abcc49e6e.zip
hdf5-3c0de7fb0cb1fdcc83bf376be6aead3abcc49e6e.tar.gz
hdf5-3c0de7fb0cb1fdcc83bf376be6aead3abcc49e6e.tar.bz2
[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.
Diffstat (limited to 'tools/h5repack')
-rw-r--r--tools/h5repack/Makefile.am3
-rw-r--r--tools/h5repack/Makefile.in8
2 files changed, 10 insertions, 1 deletions
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)