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 /perform | |
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 'perform')
-rw-r--r-- | perform/Makefile.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/perform/Makefile.in b/perform/Makefile.in index f6b0617..496d2ee 100644 --- a/perform/Makefile.in +++ b/perform/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 = @BUILD_PARALLEL_CONDITIONAL_TRUE@am__EXEEXT_1 = h5perf$(EXEEXT) \ @BUILD_PARALLEL_CONDITIONAL_TRUE@ perf$(EXEEXT) @@ -101,7 +100,7 @@ perf_meta_DEPENDENCIES = $(LIBH5TEST) $(LIBHDF5) zip_perf_SOURCES = zip_perf.c zip_perf_OBJECTS = zip_perf.$(OBJEXT) zip_perf_DEPENDENCIES = $(LIBH5TOOLS) $(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 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ |