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