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 /tools/h5import | |
| 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 'tools/h5import')
| -rwxr-xr-x | tools/h5import/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 097075a..209234b 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -61,7 +61,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) @@ -75,7 +76,7 @@ h5importtest_SOURCES = h5importtest.c h5importtest_OBJECTS = h5importtest.$(OBJEXT) h5importtest_LDADD = $(LDADD) h5importtest_DEPENDENCIES = $(LIBHDF5) $(LIBH5TOOLS) -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) \ |