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 /hl/c++ | |
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 'hl/c++')
-rw-r--r-- | hl/c++/Makefile.in | 3 | ||||
-rw-r--r-- | hl/c++/examples/Makefile.in | 3 | ||||
-rw-r--r-- | hl/c++/src/H5PacketTable.h | 2 | ||||
-rw-r--r-- | hl/c++/src/Makefile.am | 2 | ||||
-rw-r--r-- | hl/c++/src/Makefile.in | 9 | ||||
-rw-r--r-- | hl/c++/test/Makefile.am | 2 | ||||
-rw-r--r-- | hl/c++/test/Makefile.in | 10 |
7 files changed, 22 insertions, 9 deletions
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index d57a8b3..27afbac 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -267,6 +267,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 diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 2332adf..8fd1052 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -264,6 +264,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 diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h index 518aa23..71c9de5 100644 --- a/hl/c++/src/H5PacketTable.h +++ b/hl/c++/src/H5PacketTable.h @@ -23,7 +23,7 @@ #ifndef H5PTWRAP_H #define H5PTWRAP_H -#include "H5PT.h" +#include "H5PTpublic.h" class H5_HLCPPDLL PacketTable { diff --git a/hl/c++/src/Makefile.am b/hl/c++/src/Makefile.am index 63e95b6..ad1e06c 100644 --- a/hl/c++/src/Makefile.am +++ b/hl/c++/src/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/config/commence.am # Include src directory -INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src +INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src # This is our main target lib_LTLIBRARIES=libhdf5_hl_cpp.la diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 89296c2..c8e4383 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -290,6 +290,12 @@ RM = rm -f CP = cp TIME = time +# Path for hl needed in hdf5.h + +# Include src directory +INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \ + -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 @@ -334,9 +340,6 @@ TRACE = perl $(top_srcdir)/bin/trace # *.clog are from the MPE option. CHECK_CLEANFILES = *.chkexe *.chklog *.clog -# Include src directory -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src - # This is our main target lib_LTLIBRARIES = libhdf5_hl_cpp.la diff --git a/hl/c++/test/Makefile.am b/hl/c++/test/Makefile.am index d438e41..c69d0e0 100644 --- a/hl/c++/test/Makefile.am +++ b/hl/c++/test/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/config/commence.am # Include directories -INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test +INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test # Shared C++ libraries aren't universally supported. if CXX_SHARED_CONDITIONAL diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 4aeb064..8ebea41 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -284,6 +284,13 @@ RM = rm -f CP = cp TIME = time +# Path for hl needed in hdf5.h + +# Include directories +INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \ + -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src \ + -I$(top_srcdir)/test + # 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 @@ -328,9 +335,6 @@ TRACE = perl $(top_srcdir)/bin/trace # *.clog are from the MPE option. CHECK_CLEANFILES = *.chkexe *.chklog *.clog -# Include directories -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test - # Shared C++ libraries aren't universally supported. @CXX_SHARED_CONDITIONAL_FALSE@AM_LDFLAGS = -static |