diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2008-05-20 01:29:26 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2008-05-20 01:29:26 (GMT) |
| commit | 4344cf539168e127f87c6f86171bc3cbd66e4032 (patch) | |
| tree | 0a37970e35bf7156347d178fd809a9cb566fe4d6 /c++/examples | |
| parent | 6631ced7a910a7fd9b7752faae0b1321979dd009 (diff) | |
| download | hdf5-4344cf539168e127f87c6f86171bc3cbd66e4032.zip hdf5-4344cf539168e127f87c6f86171bc3cbd66e4032.tar.gz hdf5-4344cf539168e127f87c6f86171bc3cbd66e4032.tar.bz2 | |
[svn-r15042] Bug fix.
Description:
The fortran Makefile.am used HDF_FORTRAN to indicate it is part of the
Fortran API source so that conclude.am will give fortran api prefix in the
test output. The symbox HDF_FORTRAN is also used in configure for a different
purpose (indicated --enable-fortran). They conflicted.
Similar problem for the symbol HDF_CXX.
Solution:
Changed all the involved Makefile.am to use "FORTRAN_API" instead. It is
a more appropriate name. Same for CXX_API.
Along the way, discovered that the Makefile.am of hl/fortran/test and
hl/cxx/test did not have those symbols at all. Added them in.
Platform tested:
Kagiso serial and h5committested (kagisopp, smirom, linew).
Diffstat (limited to 'c++/examples')
| -rw-r--r-- | c++/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | c++/examples/Makefile.in | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am index 9e94e03..f97a3f3 100644 --- a/c++/examples/Makefile.am +++ b/c++/examples/Makefile.am @@ -35,7 +35,7 @@ readdata.chkexe_: create.chkexe_ chunks.chkexe_: extend_ds.chkexe_ # Tell conclude.am that these are C++ tests. -HDF_CXX=yes +CXX_API=yes # Where to install examples EXAMPLEDIR=$(docdir)/hdf5/examples/c++ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index d7cb7c2..5084b70 100644 --- a/c++/examples/Makefile.in +++ b/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@ @@ -328,6 +326,9 @@ INSTALL_FILES = create.cpp readdata.cpp writedata.cpp compound.cpp \ extend_ds.cpp chunks.cpp h5group.cpp +# Tell conclude.am that these are C++ tests. +CXX_API = yes + # Where to install examples EXAMPLEDIR = $(docdir)/hdf5/examples/c++ @@ -683,10 +684,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 \ @@ -722,10 +723,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 \ |