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/h5copy | |
| 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/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 958b30f..8f141a5 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -71,6 +71,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) @@ -353,6 +356,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 @@ -444,7 +450,7 @@ clean-checkPROGRAMS: done 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) |