summaryrefslogtreecommitdiffstats
path: root/c++/test
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2007-06-29 20:52:56 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2007-06-29 20:52:56 (GMT)
commit1d7e8f9deedf6b2ce1cb6b7eea92236ed2f8dc28 (patch)
tree701e6acc390362121f10decfe692ed520f73f357 /c++/test
parent1091bb70297776d18a236e3efc55ac415a21c0f8 (diff)
downloadhdf5-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 'c++/test')
-rw-r--r--c++/test/Makefile.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 787306f..1cfe7e6 100644
--- a/c++/test/Makefile.in
+++ b/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 = dsets$(EXEEXT) testhdf5$(EXEEXT)
am_dsets_OBJECTS = dsets.$(OBJEXT) h5cpputil.$(OBJEXT)
@@ -74,7 +73,7 @@ am_testhdf5_OBJECTS = testhdf5.$(OBJEXT) tattr.$(OBJEXT) \
testhdf5_OBJECTS = $(am_testhdf5_OBJECTS)
testhdf5_LDADD = $(LDADD)
testhdf5_DEPENDENCIES = $(LIBH5CPP) $(LIBH5TEST) $(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) \