diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2007-06-29 20:52:56 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2007-06-29 20:52:56 (GMT) |
| commit | 1d7e8f9deedf6b2ce1cb6b7eea92236ed2f8dc28 (patch) | |
| tree | 701e6acc390362121f10decfe692ed520f73f357 /hl/c++ | |
| parent | 1091bb70297776d18a236e3efc55ac415a21c0f8 (diff) | |
| download | hdf5-1d7e8f9deedf6b2ce1cb6b7eea92236ed2f8dc28.zip hdf5-1d7e8f9deedf6b2ce1cb6b7eea92236ed2f8dc28.tar.gz hdf5-1d7e8f9deedf6b2ce1cb6b7eea92236ed2f8dc28.tar.bz2 | |
[svn-r13928] Purpose: 1) Moving H5_CXX_HAVE_OFFSETOF macro to src/H5pubconf.h file.
2) Removing configuration of c++/src/H5cxx_pubconf.h file.
Reasoning: the additional pubconf file caused compilation complications, this is cleaner.
Tested: kagiso, smirom
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/Makefile.in | 5 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.in | 5 |
4 files changed, 6 insertions, 10 deletions
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 91dae4c..81cb283 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -58,8 +58,7 @@ 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 \ - $(top_builddir)/c++/src/H5cxx_config.h +CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index eb66928..fe344d9 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -63,8 +63,7 @@ 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 \ - $(top_builddir)/c++/src/H5cxx_config.h +CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index b29b201..35f1148 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -60,8 +60,7 @@ 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 \ - $(top_builddir)/c++/src/H5cxx_config.h +CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -75,7 +74,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libhdf5_hl_cpp_la_LIBADD = am_libhdf5_hl_cpp_la_OBJECTS = H5PacketTable.lo libhdf5_hl_cpp_la_OBJECTS = $(am_libhdf5_hl_cpp_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/c++/src@am__isrc@ +DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/bin/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 4367b8c..d619d7b 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -59,8 +59,7 @@ 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 \ - $(top_builddir)/c++/src/H5cxx_config.h +CONFIG_HEADER = $(top_builddir)/src/H5config.h CONFIG_CLEAN_FILES = am__EXEEXT_1 = ptableTest$(EXEEXT) am_ptableTest_OBJECTS = ptableTest.$(OBJEXT) @@ -68,7 +67,7 @@ ptableTest_OBJECTS = $(am_ptableTest_OBJECTS) ptableTest_LDADD = $(LDADD) ptableTest_DEPENDENCIES = $(LIBH5CPP_HL) $(LIBH5_HL) $(LIBH5CPP) \ $(LIBHDF5) -DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/c++/src@am__isrc@ +DEFAULT_INCLUDES = -I. -I$(top_builddir)/src@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/bin/depcomp am__depfiles_maybe = depfiles CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ |