diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2007-06-28 20:36:08 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2007-06-28 20:36:08 (GMT) |
| commit | 58467956ba56fc52dd03e3540f14b062f9a6c5bb (patch) | |
| tree | ddff2bedfd24083e8a180e1492fa169160104e67 /hl/tools | |
| parent | 10f04e651970fde07a8ac61e92359eaaad977571 (diff) | |
| download | hdf5-58467956ba56fc52dd03e3540f14b062f9a6c5bb.zip hdf5-58467956ba56fc52dd03e3540f14b062f9a6c5bb.tar.gz hdf5-58467956ba56fc52dd03e3540f14b062f9a6c5bb.tar.bz2 | |
[svn-r13925] Purpose: intermediate checkin for offsetof fix for PGI compiler.
Description: added new configuration to generate a pubconf file
in the c++/src directory, H5cxx_pubconf.h. When C++
compiler recognizes 'offsetof', the macro
H5_CXX_HAVE_OFFSETOF is defined in the new
pubconf file.
tested: kagiso, smirom
Diffstat (limited to 'hl/tools')
| -rw-r--r-- | hl/tools/Makefile.in | 3 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index aa08313..619b902 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -58,7 +58,8 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/H5config.h +CONFIG_HEADER = $(top_builddir)/src/H5config.h \ + $(top_builddir)/c++/src/H5cxx_config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index f8befa4..1778735 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -60,7 +60,8 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs -CONFIG_HEADER = $(top_builddir)/src/H5config.h +CONFIG_HEADER = $(top_builddir)/src/H5config.h \ + $(top_builddir)/c++/src/H5cxx_config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @@ -78,7 +79,7 @@ am_h52gifgentst_OBJECTS = h52gifgentst.$(OBJEXT) h52gifgentst_OBJECTS = $(am_h52gifgentst_OBJECTS) h52gifgentst_LDADD = $(LDADD) h52gifgentst_DEPENDENCIES = $(LIBH5_HL) $(LIBH5TOOLS) $(LIBHDF5) -DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@ +DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/c++/src@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/bin/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |