diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2009-09-18 18:34:37 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2009-09-18 18:34:37 (GMT) |
| commit | 3a83be48fb88572d675507a5d5cfbacb302f1ad7 (patch) | |
| tree | 62a02358948629bd268d90e0e1ac79496276cf07 /tools | |
| parent | 8664cb26c3da2749e4c82d99454701352cc15b0e (diff) | |
| download | hdf5-3a83be48fb88572d675507a5d5cfbacb302f1ad7.zip hdf5-3a83be48fb88572d675507a5d5cfbacb302f1ad7.tar.gz hdf5-3a83be48fb88572d675507a5d5cfbacb302f1ad7.tar.bz2 | |
[svn-r17499] Purpose:
Stage 2 implementation of embedded library information feature.
H5.c: added code to print the embedded library information when there is
a library versions mis-match occurs. This ensures the library information
string is included in the executable.
Also modifies the code so that the Library mismatch warning string is
included only once in the executable.
H5private.h:
Added a global reference to the libinfo string variable to prepare
for possible stage 3 implementation of a public API.
test/testlibinfo.sh.in:
A new test added to verify the library information is indeed included
in the executables.
configure.in:
configure:
Added entry to auto-generate test/testlibinfo.sh.
H5detect.c:
Modified the libhdf5settings generating code to allow it to insert the
strings to a file other than stdout. This maybe needed in stage 3
implementation.
MANIFEST:
updated with the newly added file of testlibinfo.sh.in.
Tested:
h5committest passed. Also passed jam in serial mode.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lib/Makefile.in | 3 | ||||
| -rw-r--r-- | tools/misc/Makefile.in | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 14d9a6d..55785c7 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -72,6 +72,7 @@ am_libh5tools_la_OBJECTS = h5tools.lo h5tools_str.lo h5tools_utils.lo \ h5diff_util.lo h5trav.lo h5tools_filters.lo h5tools_ref.lo \ h5tools_type.lo libh5tools_la_OBJECTS = $(am_libh5tools_la_OBJECTS) +am__EXEEXT_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src depcomp = $(SHELL) $(top_srcdir)/bin/depcomp am__depfiles_maybe = depfiles @@ -354,7 +355,7 @@ libh5tools_la_SOURCES = h5tools.c h5tools_str.c h5tools_utils.c h5diff.c \ # Test program. Link using libhdf5 and libh5tools -TEST_PROG = +TEST_PROG = # Name libh5tools.la so that dependencies work out. Automake knows how # to build 'libh5tools.la', but not '../../tools/lib/libh5tools.la'. diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 5f5d640..78a42b8 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -71,13 +71,6 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" am__EXEEXT_1 = h5repart_gentest$(EXEEXT) talign$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) -talign_SOURCES = talign.c -talign_OBJECTS = talign.$(OBJEXT) -talign_LDADD = $(LDADD) -talign_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) -talign_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(talign_LDFLAGS) \ - $(LDFLAGS) -o $@ h5debug_SOURCES = h5debug.c h5debug_OBJECTS = h5debug.$(OBJEXT) h5debug_LDADD = $(LDADD) @@ -107,6 +100,10 @@ repart_test_SOURCES = repart_test.c repart_test_OBJECTS = repart_test.$(OBJEXT) repart_test_LDADD = $(LDADD) repart_test_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) +talign_SOURCES = talign.c +talign_OBJECTS = talign.$(OBJEXT) +talign_LDADD = $(LDADD) +talign_DEPENDENCIES = $(LIBH5TOOLS) $(LIBHDF5) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ |