diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2008-05-19 05:06:51 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2008-05-19 05:06:51 (GMT) |
| commit | ca94c839d55e383f541c9713e0a0aa085a0572af (patch) | |
| tree | d0ec359b7855d254734ea7c5cc9d6bde383add62 /fortran/testpar | |
| parent | 2adc43f81221954e16da3338445323f1e4d958ad (diff) | |
| download | hdf5-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 'fortran/testpar')
| -rw-r--r-- | fortran/testpar/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/testpar/Makefile.in | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am index 7250653..9f9fc43 100644 --- a/fortran/testpar/Makefile.am +++ b/fortran/testpar/Makefile.am @@ -47,6 +47,6 @@ parallel_test_SOURCES=ptest.f90 hyper.f90 mdset.f90 LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5) # Mark this directory as part of the Fortran API -HDF_FORTRAN=yes +FORTRAN_API=yes include $(top_srcdir)/config/conclude.am diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 2851c6b..ca7ef59 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -153,9 +153,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@ @@ -352,6 +350,9 @@ parallel_test_SOURCES = ptest.f90 hyper.f90 mdset.f90 # The tests depend on several libraries. LDADD = $(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5) +# Mark this directory as part of the Fortran API +FORTRAN_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 @@ -708,10 +709,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 \ @@ -747,10 +748,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 \ |