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/tools | |
| 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/tools')
| -rw-r--r-- | hl/tools/Makefile.in | 3 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 619b902..aa08313 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/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/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 1778735..f8befa4 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/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__installdirs = "$(DESTDIR)$(bindir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) @@ -79,7 +78,7 @@ am_h52gifgentst_OBJECTS = h52gifgentst.$(OBJEXT) h52gifgentst_OBJECTS = $(am_h52gifgentst_OBJECTS) h52gifgentst_LDADD = $(LDADD) h52gifgentst_DEPENDENCIES = $(LIBH5_HL) $(LIBH5TOOLS) $(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) \ |