diff options
Diffstat (limited to 'fortran/src')
| -rw-r--r-- | fortran/src/Makefile.am | 2 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am index 4216f34..47caf20 100644 --- a/fortran/src/Makefile.am +++ b/fortran/src/Makefile.am @@ -149,7 +149,7 @@ H5fortran_detect.f90: H5test_kind$(EXEEXT) H5test_kind_SOURCES = $(srcdir)/H5test_kind.f90 # Mark this directory as part of the Fortran API -HDF_FORTRAN=yes +FORTRAN_API=yes # Hardcode the dependencies of these files. There isn't a known way of # determining this automagically (like we do with the C files). So, when diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index a23b608..d717520 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -204,9 +204,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@ @@ -443,6 +441,9 @@ H5fortran_detect_SOURCES = H5fortran_detect.f90 # how to compile a fortran program given its sources. H5test_kind_SOURCES = $(srcdir)/H5test_kind.f90 +# 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 @@ -992,10 +993,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 \ @@ -1031,10 +1032,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 \ |