summaryrefslogtreecommitdiffstats
path: root/fortran/examples/Makefile.in
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2008-05-20 01:29:26 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2008-05-20 01:29:26 (GMT)
commit4344cf539168e127f87c6f86171bc3cbd66e4032 (patch)
tree0a37970e35bf7156347d178fd809a9cb566fe4d6 /fortran/examples/Makefile.in
parent6631ced7a910a7fd9b7752faae0b1321979dd009 (diff)
downloadhdf5-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 'fortran/examples/Makefile.in')
-rw-r--r--fortran/examples/Makefile.in15
1 files changed, 8 insertions, 7 deletions
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index d806d9f..eafb90a 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -140,9 +140,7 @@ HAVE_DMALLOC = @HAVE_DMALLOC@
HDF5_HL = @HDF5_HL@
HDF5_INTERFACES = @HDF5_INTERFACES@
HDF_CXX = @HDF_CXX@
-
-# Mark this directory as part of the Fortran API
-HDF_FORTRAN = yes
+HDF_FORTRAN = @HDF_FORTRAN@
HID_T = @HID_T@
HL = @HL@
HL_FOR = @HL_FOR@
@@ -339,6 +337,9 @@ INSTALL_FILES = dsetexample.f90 fileexample.f90 rwdsetexample.f90 \
refregexample.f90 mountexample.f90 compound.f90 ph5example.f90
+# Mark this directory as part of the Fortran API
+FORTRAN_API = yes
+
# Tell automake how to install examples
EXAMPLEDIR = $(docdir)/hdf5/examples/fortran
@@ -711,10 +712,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 \
@@ -750,10 +751,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 \