diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-23 23:10:30 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-07-23 23:10:30 (GMT) |
| commit | 51fd7c574f80ba3031be63c1a88fb08876bf1d93 (patch) | |
| tree | 3c3debf3b39f0eac9aa431a016bd4e98f974a7c9 /tools/h5ls | |
| parent | 239c45e0f5845406f931f612cf1e88a2203917ae (diff) | |
| download | hdf5-51fd7c574f80ba3031be63c1a88fb08876bf1d93.zip hdf5-51fd7c574f80ba3031be63c1a88fb08876bf1d93.tar.gz hdf5-51fd7c574f80ba3031be63c1a88fb08876bf1d93.tar.bz2 | |
[svn-r17233] Description:
Bring r17209:17230 from trunk to revise_chunks branch.
Tested on:
Mac OS X/32 10.5.7 (amazon) debug
h5committest not required on this branch
Diffstat (limited to 'tools/h5ls')
| -rw-r--r-- | tools/h5ls/Makefile.am | 3 | ||||
| -rw-r--r-- | tools/h5ls/Makefile.in | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tools/h5ls/Makefile.am b/tools/h5ls/Makefile.am index 439ef07..64e89f1 100644 --- a/tools/h5ls/Makefile.am +++ b/tools/h5ls/Makefile.am @@ -31,6 +31,9 @@ SCRIPT_DEPEND=h5ls$(EXEEXT) # This is our main target, the h5ls tool bin_PROGRAMS=h5ls +# Add h5ls specific linker flags here +h5ls_LDFLAGS = $(LT_STATIC_EXEC) + # All programs depend on the hdf5 and h5tools libraries LDADD=$(LIBH5TOOLS) $(LIBHDF5) diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 72fc0bf..c668ecc 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -69,6 +69,9 @@ h5ls_SOURCES = h5ls.c h5ls_OBJECTS = h5ls.$(OBJEXT) h5ls_LDADD = $(LDADD) h5ls_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) +h5ls_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(h5ls_LDFLAGS) \ + $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/bin/depcomp am__depfiles_maybe = depfiles @@ -343,6 +346,9 @@ TEST_SCRIPT = testh5ls.sh check_SCRIPTS = $(TEST_SCRIPT) SCRIPT_DEPEND = h5ls$(EXEEXT) +# Add h5ls specific linker flags here +h5ls_LDFLAGS = $(LT_STATIC_EXEC) + # All programs depend on the hdf5 and h5tools libraries LDADD = $(LIBH5TOOLS) $(LIBHDF5) @@ -426,7 +432,7 @@ clean-binPROGRAMS: done h5ls$(EXEEXT): $(h5ls_OBJECTS) $(h5ls_DEPENDENCIES) @rm -f h5ls$(EXEEXT) - $(LINK) $(h5ls_OBJECTS) $(h5ls_LDADD) $(LIBS) + $(h5ls_LINK) $(h5ls_OBJECTS) $(h5ls_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) |