6 files changed, 18 insertions, 0 deletions
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am
index fb9ae98..e09dd67 100644
--- a/c++/examples/Makefile.am
+++ b/c++/examples/Makefile.am
@@ -42,6 +42,9 @@ INSTALL_FILES=create.cpp readdata.cpp writedata.cpp compound.cpp         \
 MOSTLYCLEANFILES=*.h5
 CLEANFILES=$(EXTRA_PROG)
 
+# Tell conclude.am that these are C++ tests.
+HDF_CXX=yes
+
 # How to install examples
 EXAMPLEDIR=$(docdir)/hdf5/examples/c++
 
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 02c5306..eb43708 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -294,6 +294,9 @@ INSTALL_FILES = create.cpp readdata.cpp writedata.cpp compound.cpp         \
 MOSTLYCLEANFILES = *.h5
 CLEANFILES = $(EXTRA_PROG)
 
+# Tell conclude.am that these are C++ tests.
+HDF_CXX = yes
+
 # How to install examples
 EXAMPLEDIR = $(docdir)/hdf5/examples/c++
 
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am
index 08cd88d..585f9c1 100644
--- a/c++/src/Makefile.am
+++ b/c++/src/Makefile.am
@@ -53,4 +53,7 @@ include_HEADERS=H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h
 # distclean.
 DISTCLEANFILES=h5c++ libhdf5.settings
 
+# Mark this directory as part of the C++ API
+HDF_CXX=yes
+
 include $(top_srcdir)/config/conclude.am
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index f9c0818..c95acd3 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -349,6 +349,9 @@ include_HEADERS = H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h
 # distclean.
 DISTCLEANFILES = h5c++ libhdf5.settings
 
+# Mark this directory as part of the C++ API
+HDF_CXX = yes
+
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
 # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and
diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am
index 4e221fe..a4c2cfc 100644
--- a/c++/test/Makefile.am
+++ b/c++/test/Makefile.am
@@ -36,4 +36,7 @@ LDADD=$(LIBH5CPP) $(LIBH5TEST) $(LIBHDF5)
 dsets_SOURCES=dsets.cpp h5cpputil.cpp
 testhdf5_SOURCES=testhdf5.cpp tattr.cpp tfile.cpp th5s.cpp h5cpputil.cpp
 
+# Tell conclude.am that these are C++ tests.
+HDF_CXX=yes
+
 include $(top_srcdir)/config/conclude.am
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index e5f1f9f..3d8c504 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -318,6 +318,9 @@ LDADD = $(LIBH5CPP) $(LIBH5TEST) $(LIBHDF5)
 dsets_SOURCES = dsets.cpp h5cpputil.cpp
 testhdf5_SOURCES = testhdf5.cpp tattr.cpp tfile.cpp th5s.cpp h5cpputil.cpp
 
+# Tell conclude.am that these are C++ tests.
+HDF_CXX = yes
+
 # Automake needs to be taught how to build lib, progs, and tests targets.
 # These will be filled in automatically for the most part (e.g.,
 # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and