[svn-r10656] Purpose:

Output tweak

Description:
Test output in C++ and Fortran directories now puts "C++ API:" or
"Fortran API:" in front of the name of the test being run.
I had overlooked the line of code that caused this to happen.

Solution:
Added HDF_CXX and HDF_FORTRAN variables to C++ and Fortran Makefiles.am.

Platforms tested:
heping (minor change)

14 files changed, 44 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
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index 618d6ca..f6d53b3 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -47,6 +47,9 @@ INSTALL_FILES=dsetexample.f90 fileexample.f90 rwdsetexample.f90             \
 # Tell automake which files to clean
 CLEANFILES=*.h5 $(EXTRA_PROG)
 
+# Mark this directory as part of the Fortran API
+HDF_FORTRAN=yes
+
 # Tell automake how to build examples using h5fc
 # Additional dependencies for the examples are listed below
 $(EXTRA_PROG): $(LIBHDF5) $(LIBH5F)
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index 0dbbad4..f69a029 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -299,6 +299,9 @@ INSTALL_FILES = dsetexample.f90 fileexample.f90 rwdsetexample.f90             \
 # Tell automake which files to clean
 CLEANFILES = *.h5 $(EXTRA_PROG)
 
+# Mark this directory as part of the Fortran API
+HDF_FORTRAN = yes
+
 # Tell automake how to install examples
 EXAMPLEDIR = $(docdir)/hdf5/examples/fortran
 
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index b044694..88340a3 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -92,6 +92,9 @@ else
   H5FC_NAME = h5fc
 endif
 
+# Mark this directory as part of the Fortran API
+HDF_FORTRAN=yes
+
 # Hardcode the dependencies of these files. There isn't a known way of
 # determining this automagically (like we do with the C files). So, when
 # doing a parallel make, some modules could be made way before the
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index a6ec808..7b4ebea 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -363,6 +363,9 @@ settings_DATA = libhdf5_fortran.settings
 # is configured for parallel mode
 @BUILD_PARALLEL_CONDITIONAL_TRUE@H5FC_NAME = h5pfc
 
+# Mark this directory as part of the Fortran API
+HDF_FORTRAN = 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/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 533458b..8d9419a 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -57,6 +57,10 @@ LDADD=libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
 # Temporary files
 MOSTLYCLEANFILES=*.h5 *.tmp
 
+# Mark this directory as part of the Fortran API (this affects output
+# from tests in conclude.am)
+HDF_FORTRAN=yes
+
 ## Fortran dependencies must be hardcoded, unfortunately.
 ##FORTLIBTEST_OBJ= fortranlib_test.lo                                    \
 ##        tH5F.lo tH5D.lo tH5R.lo tH5S.lo tH5T.lo tH5VL.lo tH5Z.lo       \
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 447ac46..6f8aae7 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -378,6 +378,10 @@ LDADD = libh5test_fortran.la $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
 # Temporary files
 MOSTLYCLEANFILES = *.h5 *.tmp
 
+# Mark this directory as part of the Fortran API (this affects output
+# from tests in conclude.am)
+HDF_FORTRAN = 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/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index 04e2ed3..ed1e4bc 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -39,6 +39,9 @@ ptesthdf5_fortran_SOURCES=thdf5.f90 ptesthdf5_fortran.f90 thyperslab_wr.f90
 # The tests depend on several libraries.
 LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
 
+# Mark this directory as part of the Fortran API
+HDF_FORTRAN=yes
+
 # Fortran module files can have different extensions and different names
 # (e.g., different capitalizations) on different platforms.  Write rules
 # for them explicitly rather than trying to teach automake about them.
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 1914500..1b69551 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -315,6 +315,9 @@ ptesthdf5_fortran_SOURCES = thdf5.f90 ptesthdf5_fortran.f90 thyperslab_wr.f90
 # The tests depend on several libraries.
 LDADD = $(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
 
+# Mark this directory as part of the Fortran API
+HDF_FORTRAN = 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