diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-04-12 21:21:38 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2006-04-12 21:21:38 (GMT) |
| commit | bc66efc788bc77c9c133a9fc3cc29e26fa659bab (patch) | |
| tree | d94f011f1813b4bc479a74f29048418c83f86d02 /src | |
| parent | 3dfec8d73b65c5c715581e41844e075b84e8f581 (diff) | |
| download | hdf5-bc66efc788bc77c9c133a9fc3cc29e26fa659bab.zip hdf5-bc66efc788bc77c9c133a9fc3cc29e26fa659bab.tar.gz hdf5-bc66efc788bc77c9c133a9fc3cc29e26fa659bab.tar.bz2 | |
[svn-r12229] Purpose:
new feature
Description:
1) separated the HL library into "public" and "private" header files, with the same caracteristics as the basic library
2) added the public headers to hdf5.h (with a conditional include macro, defined in configure.in)
3) added the path to HL in all Makefile.am 's , because of the inclusion in hdf5.h
Solution:
Platforms tested:
linux 32, 64
AIX
solaris
with fortran and c++
(one packet table example fails)
Misc. update:
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5config.h.in | 3 | ||||
| -rwxr-xr-x | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/Makefile.in | 3 | ||||
| -rw-r--r-- | src/hdf5.h | 8 |
4 files changed, 15 insertions, 0 deletions
diff --git a/src/H5config.h.in b/src/H5config.h.in index 1ad2692..3dd4515 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -367,6 +367,9 @@ long. */ #undef HW_FP_TO_LLONG_NOT_WORKS +/* Define if HDF5's high-level library headers should be included in hdf5.h */ +#undef INCLUDE_HL + /* Define if your system can accurately convert from integers to long double values. */ #undef INTEGER_TO_LDOUBLE_ACCURATE diff --git a/src/Makefile.am b/src/Makefile.am index 32e4ed5..c590ee5 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -20,6 +20,7 @@ include $(top_srcdir)/config/commence.am include $(top_srcdir)/config/lt_vers.am + # How to build H5detect for number format detection. # Use -g to force no optimization since many compilers (e.g., Intel) takes # a long time to compile it with any optimization on. H5detect is used diff --git a/src/Makefile.in b/src/Makefile.in index 95856b5..0ac1a3c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -329,6 +329,9 @@ RM = rm -f CP = cp TIME = time +# Path for hl needed in hdf5.h +INCLUDES = -I$(top_srcdir)/hl/src + # Some machines need a command to run executables; this is that command # so that our tests will run. # We use RUNTESTS instead of RUNSERIAL directly because it may be that @@ -48,4 +48,12 @@ #include "H5FDstdio.h" /* Standard C buffered I/O */ #include "H5FDstream.h" /* In-memory files streamed via sockets */ +/* High Level */ +#if defined (H5_INCLUDE_HL) +#include "H5DSpublic.h" /* dimension scales */ +#include "H5LTpublic.h" /* lite */ +#include "H5IMpublic.h" /* image */ +#include "H5TBpublic.h" /* table */ +#endif /*H5_INCLUDE_HL*/ + #endif |