diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-08-31 18:38:17 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-08-31 18:38:17 (GMT) |
commit | 3c0de7fb0cb1fdcc83bf376be6aead3abcc49e6e (patch) | |
tree | b06170309bdc41e49843a6a7a66b94bb03bb43e5 /tools/h5diff | |
parent | ee3ed7a67ff8a3d8a3ce2dac4e6942724ba33c85 (diff) | |
download | hdf5-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/h5diff')
-rw-r--r-- | tools/h5diff/Makefile.am | 3 | ||||
-rw-r--r-- | tools/h5diff/Makefile.in | 8 |
2 files changed, 10 insertions, 1 deletions
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) |