diff options
Diffstat (limited to 'hl/c++/examples')
| -rw-r--r-- | hl/c++/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/c++/examples/Makefile.in | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/hl/c++/examples/Makefile.am b/hl/c++/examples/Makefile.am index 51fabda..7ccc92b 100644 --- a/hl/c++/examples/Makefile.am +++ b/hl/c++/examples/Makefile.am @@ -29,7 +29,7 @@ TEST_PROG=ptExampleFL ptExampleVL INSTALL_FILES=ptExampleFL.cpp ptExampleVL.cpp # Tell conclude.am that these are C++ tests. -HDF_CXX=yes +CXX_API=yes # Where to install examples EXAMPLEDIR=$(docdir)/hdf5/examples/hl/c++ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index b67cab4..6a10074 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -139,9 +139,7 @@ HADDR_T = @HADDR_T@ HAVE_DMALLOC = @HAVE_DMALLOC@ HDF5_HL = @HDF5_HL@ HDF5_INTERFACES = @HDF5_INTERFACES@ - -# Tell conclude.am that these are C++ tests. -HDF_CXX = yes +HDF_CXX = @HDF_CXX@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ @@ -325,6 +323,9 @@ TEST_PROG = ptExampleFL ptExampleVL # These are the example files to be installed INSTALL_FILES = ptExampleFL.cpp ptExampleVL.cpp +# Tell conclude.am that these are C++ tests. +CXX_API = yes + # Where to install examples EXAMPLEDIR = $(docdir)/hdf5/examples/hl/c++ @@ -669,10 +670,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + if test "X$(FORTRAN_API)" = "Xyes"; then \ echo "Fortran API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \ echo "Fortran API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ + elif test "X$(CXX_API)" = "Xyes"; then \ echo "C++ API: Testing $(HDF5_DRIVER) $${tname} $(TEST_FLAGS)"; \ echo "C++ API: $(HDF5_DRIVER) $${tname} $(TEST_FLAGS) Test Log" >> $${log};\ else \ @@ -708,10 +709,10 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ - if test "X$(HDF_FORTRAN)" = "Xyes"; then \ + if test "X$(FORTRAN_API)" = "Xyes"; then \ echo "Fortran API: Testing $${tname} $(TEST_FLAGS)"; \ echo "Fortran API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ - elif test "X$(HDF_CXX)" = "Xyes"; then \ + elif test "X$(CXX_API)" = "Xyes"; then \ echo "C++ API: Testing $${tname} $(TEST_FLAGS)"; \ echo "C++ API: $${tname} $(TEST_FLAGS) Test Log" >> $${log}; \ else \ |