summaryrefslogtreecommitdiffstats
path: root/c++/src
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++/src
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++/src')
-rw-r--r--c++/src/H5cxx_config.h.in5
-rw-r--r--c++/src/Makefile.am5
-rw-r--r--c++/src/Makefile.in46
3 files changed, 15 insertions, 41 deletions
diff --git a/c++/src/H5cxx_config.h.in b/c++/src/H5cxx_config.h.in
deleted file mode 100644
index 55c95f7..0000000
--- a/c++/src/H5cxx_config.h.in
+++ /dev/null
@@ -1,5 +0,0 @@
-/* c++/src/H5cxx_config.h.in Created manually. */
-
-/* Define if offsetof extension is present in CXX compiler*/
-#undef HAVE_OFFSETOF
-
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am
index a9232b1..e63b827 100644
--- a/c++/src/Makefile.am
+++ b/c++/src/Makefile.am
@@ -49,12 +49,11 @@ include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h \
H5DcreatProp.h H5DxferProp.h H5EnumType.h H5Exception.h H5FaccProp.h \
H5FcreatProp.h H5File.h H5FloatType.h H5Group.h H5IdComponent.h \
H5Include.h H5IntType.h H5Library.h H5Object.h H5PredType.h \
- H5PropList.h H5StrType.h H5CppDoc.h H5ArrayType.h H5VarLenType.h \
- H5cxx_pubconf.h
+ H5PropList.h H5StrType.h H5CppDoc.h H5ArrayType.h H5VarLenType.h
# h5c++ and libhdf5.settings are generated during configure. Remove only when
# distclean.
-DISTCLEANFILES=h5c++ libhdf5.settings H5cxx_pubconf.h
+DISTCLEANFILES=h5c++ libhdf5.settings
# Some C++ compilers/linkers (PGI?) create a directory named "ii_files" that
# holds *.ii files, which are template entity instantiations.
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index b2ea872..2f3825d 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -51,8 +51,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-DIST_COMMON = $(include_HEADERS) $(srcdir)/H5cxx_config.h.in \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in $(srcdir)/h5c++.in \
+DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/h5c++.in \
$(top_srcdir)/config/commence.am \
$(top_srcdir)/config/conclude.am
TESTS =
@@ -62,7 +62,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 H5cxx_config.h
+CONFIG_HEADER = $(top_builddir)/src/H5config.h
CONFIG_CLEAN_FILES = h5c++
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -356,13 +356,12 @@ include_HEADERS = H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h
H5DcreatProp.h H5DxferProp.h H5EnumType.h H5Exception.h H5FaccProp.h \
H5FcreatProp.h H5File.h H5FloatType.h H5Group.h H5IdComponent.h \
H5Include.h H5IntType.h H5Library.h H5Object.h H5PredType.h \
- H5PropList.h H5StrType.h H5CppDoc.h H5ArrayType.h H5VarLenType.h \
- H5cxx_pubconf.h
+ H5PropList.h H5StrType.h H5CppDoc.h H5ArrayType.h H5VarLenType.h
# h5c++ and libhdf5.settings are generated during configure. Remove only when
# distclean.
-DISTCLEANFILES = h5c++ libhdf5.settings H5cxx_pubconf.h
+DISTCLEANFILES = h5c++ libhdf5.settings
# Mark this directory as part of the C++ API
HDF_CXX = yes
@@ -382,8 +381,7 @@ TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
-all: H5cxx_config.h
- $(MAKE) $(AM_MAKEFLAGS) all-am
+all: all-am
.SUFFIXES:
.SUFFIXES: .cpp .lo .o .obj
@@ -416,23 +414,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-H5cxx_config.h: stamp-h2
- @if test ! -f $@; then \
- rm -f stamp-h2; \
- $(MAKE) $(AM_MAKEFLAGS) stamp-h2; \
- else :; fi
-
-stamp-h2: $(srcdir)/H5cxx_config.h.in $(top_builddir)/config.status
- @rm -f stamp-h2
- cd $(top_builddir) && $(SHELL) ./config.status c++/src/H5cxx_config.h
-$(srcdir)/H5cxx_config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h2
- touch $@
-
-distclean-hdr:
- -rm -f H5cxx_config.h stamp-h2
h5c++: $(top_builddir)/config.status $(srcdir)/h5c++.in
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
@@ -571,11 +552,11 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
mkid -fID $$unique
tags: TAGS
-TAGS: $(HEADERS) $(SOURCES) H5cxx_config.h.in $(TAGS_DEPENDENCIES) \
+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) H5cxx_config.h.in $(LISP) $(TAGS_FILES)'; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -587,11 +568,11 @@ TAGS: $(HEADERS) $(SOURCES) H5cxx_config.h.in $(TAGS_DEPENDENCIES) \
$$tags $$unique; \
fi
ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) H5cxx_config.h.in $(TAGS_DEPENDENCIES) \
+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
- list='$(SOURCES) $(HEADERS) H5cxx_config.h.in $(LISP) $(TAGS_FILES)'; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
@@ -638,8 +619,7 @@ distdir: $(DISTFILES)
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
check: check-am
-all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(HEADERS) H5cxx_config.h \
- all-local
+all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(HEADERS) all-local
installdirs:
for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
@@ -678,7 +658,7 @@ distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-hdr distclean-tags
+ distclean-tags
dvi: dvi-am
@@ -733,7 +713,7 @@ uninstall-am: uninstall-binSCRIPTS uninstall-includeHEADERS \
.PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \
clean clean-generic clean-libLTLIBRARIES clean-libtool ctags \
- distclean distclean-compile distclean-generic distclean-hdr \
+ distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-binSCRIPTS \
install-data install-data-am install-dvi install-dvi-am \