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/tools/gif2h5 | |
| 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/tools/gif2h5')
| -rw-r--r-- | hl/tools/gif2h5/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 9 | ||||
| -rw-r--r-- | hl/tools/gif2h5/writehdf.c | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/hl/tools/gif2h5/Makefile.am b/hl/tools/gif2h5/Makefile.am index cd5c305..c01d1b4 100644 --- a/hl/tools/gif2h5/Makefile.am +++ b/hl/tools/gif2h5/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/config/commence.am # Include src and tools/lib directories -INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src +INCLUDES+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src # These are our main targets, the tools diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index fbd61ba..61875e4 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -294,6 +294,12 @@ RM = rm -f CP = cp TIME = time +# Path for hl needed in hdf5.h + +# Include src and tools/lib directories +INCLUDES = -I$(top_srcdir)/hl/src -I$(top_srcdir)/src \ + -I$(top_srcdir)/tools/lib -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 @@ -337,9 +343,6 @@ TRACE = perl $(top_srcdir)/bin/trace # .chklog files are output from those tests. # *.clog are from the MPE option. CHECK_CLEANFILES = *.chkexe *.chklog *.clog - -# Include src and tools/lib directories -INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib -I$(top_srcdir)/hl/src gif2h5_SOURCES = gif2hdf.c gif2mem.c decompress.c gifread.c writehdf.c h52gif_SOURCES = hdf2gif.c hdfgifwr.c readhdf.c diff --git a/hl/tools/gif2h5/writehdf.c b/hl/tools/gif2h5/writehdf.c index 7313d2e..bbd74eb 100644 --- a/hl/tools/gif2h5/writehdf.c +++ b/hl/tools/gif2h5/writehdf.c @@ -16,7 +16,7 @@ #include <string.h> #include "gif.h" -#include "H5IM.h" +#include "H5IMpublic.h" /*------------------------------------------------------------------------- * Function: WriteHDF |