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/h5stat | |
| 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/h5stat')
| -rw-r--r-- | tools/h5stat/Makefile.am | 3 | ||||
| -rw-r--r-- | tools/h5stat/Makefile.in | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tools/h5stat/Makefile.am b/tools/h5stat/Makefile.am index b1c2024..a14172d 100644 --- a/tools/h5stat/Makefile.am +++ b/tools/h5stat/Makefile.am @@ -35,6 +35,9 @@ SCRIPT_DEPEND=h5stat$(EXEEXT) bin_PROGRAMS=h5stat bin_SCRIPTS= +# Add h5stat specific linker flags here +h5stat_LDFLAGS = $(LT_STATIC_EXEC) + # Tell automake to clean h5redeploy script CLEANFILES= diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 1fd860b..15b19ed 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -74,6 +74,9 @@ h5stat_SOURCES = h5stat.c h5stat_OBJECTS = h5stat.$(OBJEXT) h5stat_LDADD = $(LDADD) h5stat_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) +h5stat_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5stat_LDFLAGS) \ + $(LDFLAGS) -o $@ h5stat_gentest_SOURCES = h5stat_gentest.c h5stat_gentest_OBJECTS = h5stat_gentest.$(OBJEXT) h5stat_gentest_LDADD = $(LDADD) @@ -386,6 +389,9 @@ check_SCRIPTS = $(TEST_SCRIPT) SCRIPT_DEPEND = h5stat$(EXEEXT) bin_SCRIPTS = +# Add h5stat specific linker flags here +h5stat_LDFLAGS = $(LT_STATIC_EXEC) + # Tell automake to clean h5redeploy script CLEANFILES = @@ -500,7 +506,7 @@ clean-checkPROGRAMS: rm -f $$list h5stat$(EXEEXT): $(h5stat_OBJECTS) $(h5stat_DEPENDENCIES) @rm -f h5stat$(EXEEXT) - $(LINK) $(h5stat_OBJECTS) $(h5stat_LDADD) $(LIBS) + $(h5stat_LINK) $(h5stat_OBJECTS) $(h5stat_LDADD) $(LIBS) h5stat_gentest$(EXEEXT): $(h5stat_gentest_OBJECTS) $(h5stat_gentest_DEPENDENCIES) @rm -f h5stat_gentest$(EXEEXT) $(LINK) $(h5stat_gentest_OBJECTS) $(h5stat_gentest_LDADD) $(LIBS) |