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/h5copy | |
| 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/h5copy')
| -rw-r--r-- | tools/h5copy/Makefile.am | 3 | ||||
| -rw-r--r-- | tools/h5copy/Makefile.in | 8 |
2 files changed, 10 insertions, 1 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) |