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 /fortran | |
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 'fortran')
-rw-r--r-- | fortran/Makefile.in | 3 | ||||
-rw-r--r-- | fortran/examples/Makefile.in | 3 | ||||
-rw-r--r-- | fortran/src/Makefile.in | 5 | ||||
-rw-r--r-- | fortran/test/Makefile.in | 5 | ||||
-rw-r--r-- | fortran/testpar/Makefile.in | 5 |
5 files changed, 13 insertions, 8 deletions
diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 5a0fef8..823fcac 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -62,7 +62,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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index ae32620..b8351fe 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -63,7 +63,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 = testh5fc.sh SOURCES = DIST_SOURCES = diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index e2428e5..4f8926a 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -64,7 +64,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 = h5fc libhdf5_fortran.settings am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -102,7 +103,7 @@ H5match_types_LDADD = $(LDADD) am_H5test_kind_OBJECTS = H5test_kind.$(OBJEXT) H5test_kind_OBJECTS = $(am_H5test_kind_OBJECTS) H5test_kind_LDADD = $(LDADD) -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) \ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 2f6ee47..9c933c9 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/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 = LTLIBRARIES = $(noinst_LTLIBRARIES) libh5test_fortran_la_LIBADD = @@ -98,7 +99,7 @@ fortranlib_test_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \ fortranlib_test_LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(FCLD) $(fortranlib_test_FCFLAGS) $(FCFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -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) \ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 338a1a8..55796ae 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -59,7 +59,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__EXEEXT_1 = parallel_test$(EXEEXT) am_parallel_test_OBJECTS = ptest.$(OBJEXT) hyper.$(OBJEXT) \ @@ -68,7 +69,7 @@ parallel_test_OBJECTS = $(am_parallel_test_OBJECTS) parallel_test_LDADD = $(LDADD) parallel_test_DEPENDENCIES = $(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) \ $(LIBHDF5) -DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@ +DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/c++/src@am__isrc@ FCCOMPILE = $(FC) $(AM_FCFLAGS) $(FCFLAGS) LTFCCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(FC) $(AM_FCFLAGS) $(FCFLAGS) |