summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2008-05-19 05:06:51 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2008-05-19 05:06:51 (GMT)
commitca94c839d55e383f541c9713e0a0aa085a0572af (patch)
treed0ec359b7855d254734ea7c5cc9d6bde383add62 /c++
parent2adc43f81221954e16da3338445323f1e4d958ad (diff)
downloadhdf5-ca94c839d55e383f541c9713e0a0aa085a0572af.zip
hdf5-ca94c839d55e383f541c9713e0a0aa085a0572af.tar.gz
hdf5-ca94c839d55e383f541c9713e0a0aa085a0572af.tar.bz2
[svn-r15036] 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 only. It is a trivia change.
Diffstat (limited to 'c++')
-rw-r--r--c++/Makefile.in8
-rw-r--r--c++/examples/Makefile.am2
-rw-r--r--c++/examples/Makefile.in15
-rw-r--r--c++/src/Makefile.am2
-rw-r--r--c++/src/Makefile.in15
-rw-r--r--c++/test/Makefile.am2
-rw-r--r--c++/test/Makefile.in15
7 files changed, 31 insertions, 28 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in
index 3d4ceb3..b592c26 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -770,10 +770,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 \
@@ -809,10 +809,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 \
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 \
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am
index e63b827..3b1ed0d 100644
--- a/c++/src/Makefile.am
+++ b/c++/src/Makefile.am
@@ -64,6 +64,6 @@ mostlyclean-local:
fi
# Mark this directory as part of the C++ API
-HDF_CXX=yes
+CXX_API=yes
include $(top_srcdir)/config/conclude.am
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index e9836e9..145e20e 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -175,9 +175,7 @@ HADDR_T = @HADDR_T@
HAVE_DMALLOC = @HAVE_DMALLOC@
HDF5_HL = @HDF5_HL@
HDF5_INTERFACES = @HDF5_INTERFACES@
-
-# Mark this directory as part of the C++ API
-HDF_CXX = yes
+HDF_CXX = @HDF_CXX@
HDF_FORTRAN = @HDF_FORTRAN@
HID_T = @HID_T@
HL = @HL@
@@ -387,6 +385,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
+CXX_API = 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
@@ -856,10 +857,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 \
@@ -895,10 +896,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 \
diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am
index 4c5333f..058f925 100644
--- a/c++/test/Makefile.am
+++ b/c++/test/Makefile.am
@@ -42,7 +42,7 @@ testhdf5_SOURCES=testhdf5.cpp tattr.cpp tcompound.cpp tfile.cpp tfilter.cpp \
th5s.cpp trefer.cpp ttypes.cpp tvlstr.cpp h5cpputil.cpp
# Tell conclude.am that these are C++ tests.
-HDF_CXX=yes
+CXX_API=yes
# Some C++ compilers/linkers (PGI?) create a directory named "ii_files" that
# holds *.ii files, which are template entity instantiations.
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 9432b9a..d54afb52 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -161,9 +161,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@
@@ -357,6 +355,9 @@ testhdf5_SOURCES = testhdf5.cpp tattr.cpp tcompound.cpp tfile.cpp tfilter.cpp \
th5s.cpp trefer.cpp ttypes.cpp tvlstr.cpp h5cpputil.cpp
+# Tell conclude.am that these are C++ tests.
+CXX_API = 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
@@ -750,10 +751,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 \
@@ -789,10 +790,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 \