[svn-r26253] Update CMake with fortran source properties and defines, correct name of hl fortran examples option check

10 files changed, 178 insertions, 172 deletions

diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 3b235d4..3395906 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -10,6 +10,7 @@ INCLUDE_DIRECTORIES (${CMAKE_Fortran_MODULE_DIRECTORY} ${HDF5_F90_BINARY_DIR} ${
 # Add Test Lib
 #-----------------------------------------------------------------------------
 add_library (${HDF5_F90_C_TEST_LIB_TARGET} ${LIB_TYPE} t.c)
+set_source_files_properties (t.c PROPERTIES LANGUAGE C)
 TARGET_C_PROPERTIES (${HDF5_F90_C_TEST_LIB_TARGET} " " " ")
 target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET}
     ${HDF5_F90_C_LIB_TARGET}
@@ -18,12 +19,14 @@ target_link_libraries (${HDF5_F90_C_TEST_LIB_TARGET}
 H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} ${LIB_TYPE})
 set_target_properties (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES
     FOLDER libraries/test/fortran
+    LINKER_LANGUAGE C
     INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
 )
 
 # See if the F2008 intrinsic STORAGE_SIZE and C_SIZEOF are supported. If not then
 # fall back to F2003. If F2003 not supported then use F90 for the tests.
 
+set_source_files_properties (tf_F90.f90 tf_F03.f90 tf_F08.f90 tf.f90 PROPERTIES LANGUAGE Fortran)
 if (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
  add_library (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf_F08.f90 tf.f90)
 elseif (HDF5_ENABLE_F2003)
@@ -36,7 +39,7 @@ endif (FORTRAN_HAVE_STORAGE_SIZE AND FORTRAN_HAVE_C_SIZEOF)
 set (SHARED_LINK_FLAGS " ")
 if (WIN32)
   if (BUILD_SHARED_LIBS)
-    set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_HDF5_DLL)
+    set_property (TARGET ${HDF5_F90_TEST_LIB_TARGET} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_HDF5_TEST_DLL)
     if (MSVC)
       set (SHARED_LINK_FLAGS "/DLL")
     endif (MSVC)
@@ -53,6 +56,7 @@ target_link_libraries (${HDF5_F90_TEST_LIB_TARGET}
 H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} ${LIB_TYPE})
 set_target_properties (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES
     FOLDER libraries/test/fortran
+    LINKER_LANGUAGE Fortran
     INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
 )
 
diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90
index 063e93d..6d5911f 100644
--- a/fortran/test/tf.f90
+++ b/fortran/test/tf.f90
@@ -36,7 +36,7 @@ MODULE TH5_MISC
 CONTAINS
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: dreal_eq
 !DEC$endif
   LOGICAL FUNCTION dreal_eq(a,b)
@@ -49,7 +49,7 @@ CONTAINS
   END FUNCTION dreal_eq
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: verify_real_kind_7
 !DEC$endif
   SUBROUTINE verify_real_kind_7(string,value,correct_value,total_error)
@@ -66,7 +66,7 @@ CONTAINS
   END SUBROUTINE verify_real_kind_7
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: write_test_status
 !DEC$endif
   SUBROUTINE write_test_status( test_result, test_title, total_error)
@@ -105,7 +105,7 @@ CONTAINS
 
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: check
 !DEC$endif
   SUBROUTINE check(string,error,total_error)
@@ -119,7 +119,7 @@ CONTAINS
   END SUBROUTINE check
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: verify
 !DEC$endif
   SUBROUTINE VERIFY(string,value,correct_value,total_error)
@@ -133,7 +133,7 @@ CONTAINS
   END SUBROUTINE verify
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: verify_Fortran_INTEGER_4
 !DEC$endif
   SUBROUTINE verify_Fortran_INTEGER_4(string,value,correct_value,total_error)
@@ -150,7 +150,7 @@ CONTAINS
   END SUBROUTINE verify_Fortran_INTEGER_4
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: verifyLogical
 !DEC$endif
   SUBROUTINE verifyLogical(string,value,correct_value,total_error)
@@ -165,7 +165,7 @@ CONTAINS
   END SUBROUTINE verifyLogical
   
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: verifyString
 !DEC$endif
   SUBROUTINE verifyString(string, value,correct_value,total_error)
@@ -203,7 +203,7 @@ CONTAINS
   SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr)
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_fixname_f
 !DEC$endif
     USE H5GLOBAL
@@ -263,7 +263,7 @@ CONTAINS
   SUBROUTINE h5_cleanup_f(base_name, fapl, hdferr)
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_cleanup_f
 !DEC$endif
     USE H5GLOBAL
@@ -315,7 +315,7 @@ CONTAINS
   SUBROUTINE h5_exit_f(status)
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_exit_f
 !DEC$endif
     IMPLICIT NONE
@@ -352,7 +352,7 @@ CONTAINS
   SUBROUTINE h5_env_nocleanup_f(HDF5_NOCLEANUP)
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_env_nocleanup_f
 !DEC$endif
     IMPLICIT NONE
diff --git a/fortran/test/tf_F03.f90 b/fortran/test/tf_F03.f90
index 4513783..b3f1399 100644
--- a/fortran/test/tf_F03.f90
+++ b/fortran/test/tf_F03.f90
@@ -66,7 +66,7 @@ MODULE TH5_MISC_PROVISIONAL
 CONTAINS
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_sizeof_cmpd
  !DEC$endif
   INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CMPD(a)
@@ -78,7 +78,7 @@ CONTAINS
   END FUNCTION H5_SIZEOF_CMPD
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_sizeof_chr
 !DEC$endif
   INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CHR(a)
@@ -90,7 +90,7 @@ CONTAINS
   END FUNCTION H5_SIZEOF_CHR
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_sizeof_i
 !DEC$endif
   INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_I(a)
@@ -102,7 +102,7 @@ CONTAINS
   END FUNCTION H5_SIZEOF_I
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_sizeof_sp
 !DEC$endif
   INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_SP(a)
@@ -114,7 +114,7 @@ CONTAINS
   END FUNCTION H5_SIZEOF_SP
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_sizeof_dp
 !DEC$endif
   INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_DP(a)
diff --git a/fortran/test/tf_F08.f90 b/fortran/test/tf_F08.f90
index 5583f3f..20c2859 100644
--- a/fortran/test/tf_F08.f90
+++ b/fortran/test/tf_F08.f90
@@ -65,7 +65,7 @@ MODULE TH5_MISC_PROVISIONAL
 CONTAINS
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_sizeof_cmpd
 !DEC$endif
   INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CMPD(a)
@@ -77,7 +77,7 @@ CONTAINS
   END FUNCTION H5_SIZEOF_CMPD
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_sizeof_chr
 !DEC$endif
   INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_CHR(a)
@@ -89,7 +89,7 @@ CONTAINS
   END FUNCTION H5_SIZEOF_CHR
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_sizeof_i
 !DEC$endif
   INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_I(a)
@@ -102,7 +102,7 @@ CONTAINS
 
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_sizeof_sp
 !DEC$endif
   INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_SP(a)
@@ -114,7 +114,7 @@ CONTAINS
   END FUNCTION H5_SIZEOF_SP
 
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_TEST_DLL)
 !DEC$attributes dllexport :: h5_sizeof_dp
 !DEC$endif
   INTEGER(C_SIZE_T) FUNCTION H5_SIZEOF_DP(a)
diff --git a/hl/fortran/CMakeLists.txt b/hl/fortran/CMakeLists.txt
index d32f85f..892169c 100644
--- a/hl/fortran/CMakeLists.txt
+++ b/hl/fortran/CMakeLists.txt
@@ -9,9 +9,9 @@ add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/src ${HDF5_HL_F90_BINARY_DIR}/src)
 #-----------------------------------------------------------------------------
 # Build the HL Fortran Examples
 #-----------------------------------------------------------------------------
-if (HDF5_BUILD_FORTRAN_EXAMPLES)
+if (HDF5_BUILD_EXAMPLES)
   add_subdirectory (${HDF5_HL_F90_SOURCE_DIR}/examples ${HDF5_HL_F90_BINARY_DIR}/examples)
-endif (HDF5_BUILD_FORTRAN_EXAMPLES)
+endif (HDF5_BUILD_EXAMPLES)
 
 #-----------------------------------------------------------------------------
 # Testing
diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt
index c3a6562..f188a53 100644
--- a/hl/fortran/src/CMakeLists.txt
+++ b/hl/fortran/src/CMakeLists.txt
@@ -45,6 +45,7 @@ set (HDF5_HL_F90_F_SRCS
     ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5LTff.f90
     ${HDF5_HL_F90_SRC_SOURCE_DIR}/H5IMff.f90
 )
+set_source_files_properties (${HDF5_HL_F90_F_SRCS} PROPERTIES LANGUAGE Fortran)
 
 add_library (${HDF5_HL_F90_LIB_TARGET} ${LIB_TYPE} ${HDF5_HL_F90_F_SRCS})
 set (SHARED_LINK_FLAGS " ")
@@ -52,8 +53,8 @@ if (BUILD_SHARED_LIBS)
   if (WIN32)
     set_property (TARGET ${HDF5_HL_F90_LIB_TARGET} 
       APPEND PROPERTY COMPILE_DEFINITIONS 
-        BUILD_HDF5_DLL
-  )
+        BUILD_HDF5_HL_DLL
+    )
     if (MSVC)
       set (SHARED_LINK_FLAGS "/DLL")
     endif (MSVC)
@@ -72,6 +73,7 @@ set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF
 H5_SET_LIB_OPTIONS (${HDF5_HL_F90_LIB_TARGET} ${HDF5_HL_F90_LIB_NAME} ${LIB_TYPE})
 set_target_properties (${HDF5_HL_F90_LIB_TARGET} PROPERTIES
     FOLDER libraries/hl/fortran
+    LINKER_LANGUAGE Fortran
     INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
 )
 
diff --git a/hl/fortran/src/H5DSff.f90 b/hl/fortran/src/H5DSff.f90
index 4fbd90a..8cb568e 100644
--- a/hl/fortran/src/H5DSff.f90
+++ b/hl/fortran/src/H5DSff.f90
@@ -48,7 +48,7 @@ CONTAINS
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5dsset_scale_f
 !DEC$endif
 !
@@ -106,7 +106,7 @@ CONTAINS
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5dsattach_scale_f
 !DEC$endif
 !
@@ -159,7 +159,7 @@ CONTAINS
     
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5dsdetach_scale_f
 !DEC$endif
 !
@@ -213,7 +213,7 @@ CONTAINS
     
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5dsis_attached_f
 !DEC$endif
 !
@@ -281,7 +281,7 @@ CONTAINS
     
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5dsis_scale_f
 !DEC$endif
 !
@@ -338,7 +338,7 @@ CONTAINS
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5dsset_label_f
 !DEC$endif
 !
@@ -397,7 +397,7 @@ CONTAINS
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5dsget_label_f
 !DEC$endif
 !
@@ -455,7 +455,7 @@ CONTAINS
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5dsget_scale_name_f
 !DEC$endif
 !
@@ -507,7 +507,7 @@ CONTAINS
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5dsget_num_scales_f
 !DEC$endif
 !
diff --git a/hl/fortran/src/H5IMff.f90 b/hl/fortran/src/H5IMff.f90
index 2a66597..37030ac 100644
--- a/hl/fortran/src/H5IMff.f90
+++ b/hl/fortran/src/H5IMff.f90
@@ -51,7 +51,7 @@ subroutine h5immake_image_8bit_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5immake_image_8bit_f
 !DEC$endif
 !
@@ -115,7 +115,7 @@ subroutine h5imread_image_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5imread_image_f
 !DEC$endif
 !
@@ -175,7 +175,7 @@ subroutine h5immake_image_24bit_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5immake_image_24bit_f
 !DEC$endif
 !
@@ -249,7 +249,7 @@ subroutine h5imget_image_info_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5imget_image_info_f
 !DEC$endif
 !
@@ -317,7 +317,7 @@ integer function h5imis_image_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5imis_image_f
 !DEC$endif
 !
@@ -375,7 +375,7 @@ subroutine h5immake_palette_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5immake_palette_f
 !DEC$endif
 !
@@ -436,7 +436,7 @@ subroutine h5imlink_palette_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5imlink_palette_f
 !DEC$endif
 !
@@ -497,7 +497,7 @@ subroutine h5imunlink_palette_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5imunlink_palette_f
 !DEC$endif
 !
@@ -561,7 +561,7 @@ subroutine h5imget_npalettes_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5imget_npalettes_f
 !DEC$endif
 !
@@ -621,7 +621,7 @@ subroutine h5imget_palette_info_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5imget_palette_info_f
 !DEC$endif
 !
@@ -684,7 +684,7 @@ subroutine h5imget_palette_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5imget_palette_f
 !DEC$endif
 !
@@ -742,7 +742,7 @@ integer function h5imis_palette_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5imis_palette_f
 !DEC$endif
 !
diff --git a/hl/fortran/src/H5LTff.f90 b/hl/fortran/src/H5LTff.f90
index b06a8fe..8df024e 100644
--- a/hl/fortran/src/H5LTff.f90
+++ b/hl/fortran/src/H5LTff.f90
@@ -163,7 +163,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_int1
     !DEC$endif
     !
@@ -229,7 +229,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_int2
     !DEC$endif
     !
@@ -297,7 +297,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_int3
     !DEC$endif
     !
@@ -360,7 +360,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_int4
     !DEC$endif
     !
@@ -423,7 +423,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_int5
     !DEC$endif
     !
@@ -486,7 +486,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_int6
     !DEC$endif
     !
@@ -549,7 +549,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_int7
     !DEC$endif
     !
@@ -618,7 +618,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_float1
     !DEC$endif
     !
@@ -684,7 +684,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_float2
     !DEC$endif
     !
@@ -752,7 +752,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_float3
     !DEC$endif
     !
@@ -815,7 +815,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_float4
     !DEC$endif
     !
@@ -878,7 +878,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_float5
     !DEC$endif
     !
@@ -941,7 +941,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_float6
     !DEC$endif
     !
@@ -1004,7 +1004,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_float7
     !DEC$endif
     !
@@ -1072,7 +1072,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_double1
     !DEC$endif
     !
@@ -1138,7 +1138,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_double2
     !DEC$endif
     !
@@ -1206,7 +1206,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_double3
     !DEC$endif
     !
@@ -1269,7 +1269,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_double4
     !DEC$endif
     !
@@ -1332,7 +1332,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_double5
     !DEC$endif
     !
@@ -1395,7 +1395,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_double6
     !DEC$endif
     !
@@ -1458,7 +1458,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_f_double7
     !DEC$endif
     !
@@ -1525,7 +1525,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_int1
     !DEC$endif
     !
@@ -1588,7 +1588,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_int2
     !DEC$endif
     !
@@ -1653,7 +1653,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_int3
     !DEC$endif
     !
@@ -1714,7 +1714,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_int4
     !DEC$endif
     !
@@ -1775,7 +1775,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_int5
     !DEC$endif
     !
@@ -1836,7 +1836,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_int6
     !DEC$endif
     !
@@ -1897,7 +1897,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_int7
     !DEC$endif
     !
@@ -1963,7 +1963,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_float1
     !DEC$endif
     !
@@ -2026,7 +2026,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_float2
     !DEC$endif
     !
@@ -2092,7 +2092,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_float3
     !DEC$endif
     !
@@ -2153,7 +2153,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_float4
     !DEC$endif
     !
@@ -2214,7 +2214,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_float5
     !DEC$endif
     !
@@ -2275,7 +2275,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_float6
     !DEC$endif
     !
@@ -2336,7 +2336,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_float7
     !DEC$endif
     !
@@ -2402,7 +2402,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport ::h5ltread_dataset_f_double1
     !DEC$endif
     !
@@ -2465,7 +2465,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_double2
     !DEC$endif
     !
@@ -2530,7 +2530,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_double3
     !DEC$endif
     !
@@ -2591,7 +2591,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_double4
     !DEC$endif
     !
@@ -2652,7 +2652,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_double5
     !DEC$endif
     !
@@ -2713,7 +2713,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_double6
     !DEC$endif
     !
@@ -2774,7 +2774,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_f_double7
     !DEC$endif
     !
@@ -2839,7 +2839,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_int_f_1
     !DEC$endif
     !
@@ -2903,7 +2903,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_int_f_2
     !DEC$endif
     !
@@ -2971,7 +2971,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_int_f_3
     !DEC$endif
     !
@@ -3034,7 +3034,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_int_f_4
     !DEC$endif
     !
@@ -3097,7 +3097,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_int_f_5
     !DEC$endif
     !
@@ -3160,7 +3160,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_int_f_6
     !DEC$endif
     !
@@ -3223,7 +3223,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_int_f_7
     !DEC$endif
     !
@@ -3290,7 +3290,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_float_f_1
     !DEC$endif
     !
@@ -3354,7 +3354,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_float_f_2
     !DEC$endif
     !
@@ -3420,7 +3420,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_float_f_3
     !DEC$endif
     !
@@ -3482,7 +3482,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_float_f_4
     !DEC$endif
     !
@@ -3544,7 +3544,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_float_f_5
     !DEC$endif
     !
@@ -3606,7 +3606,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_float_f_6
     !DEC$endif
     !
@@ -3668,7 +3668,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_float_f_7
     !DEC$endif
     !
@@ -3735,7 +3735,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_double_f_1
     !DEC$endif
     !
@@ -3802,7 +3802,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_double_f_2
     !DEC$endif
     !
@@ -3868,7 +3868,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_double_f_3
     !DEC$endif
     !
@@ -3930,7 +3930,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_double_f_4
     !DEC$endif
     !
@@ -3992,7 +3992,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5
     !DEC$endif
     !
@@ -4054,7 +4054,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5
     !DEC$endif
     !
@@ -4116,7 +4116,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_double_f_5
     !DEC$endif
     !
@@ -4181,7 +4181,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_int_f_1
     !DEC$endif
     !
@@ -4245,7 +4245,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_int_f_2
     !DEC$endif
     !
@@ -4308,7 +4308,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_int_f_3
     !DEC$endif
     !
@@ -4367,7 +4367,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_int_f_4
     !DEC$endif
     !
@@ -4426,7 +4426,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_int_f_5
     !DEC$endif
     !
@@ -4485,7 +4485,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_int_f_6
     !DEC$endif
     !
@@ -4544,7 +4544,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_int_f_7
     !DEC$endif
     !
@@ -4608,7 +4608,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_float_f_1
     !DEC$endif
     !
@@ -4672,7 +4672,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_float_f_2
     !DEC$endif
     !
@@ -4735,7 +4735,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_float_f_3
     !DEC$endif
     !
@@ -4794,7 +4794,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_float_f_4
     !DEC$endif
     !
@@ -4853,7 +4853,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_float_f_5
     !DEC$endif
     !
@@ -4912,7 +4912,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_float_f_6
     !DEC$endif
     !
@@ -4971,7 +4971,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_float_f_7
     !DEC$endif
     !
@@ -5034,7 +5034,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_double_f_1
     !DEC$endif
     !
@@ -5098,7 +5098,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_double_f_2
     !DEC$endif
     !
@@ -5161,7 +5161,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_double_f_3
     !DEC$endif
     !
@@ -5220,7 +5220,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_double_f_4
     !DEC$endif
     !
@@ -5279,7 +5279,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_double_f_5
     !DEC$endif
     !
@@ -5338,7 +5338,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_double_f_6
     !DEC$endif
     !
@@ -5397,7 +5397,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_double_f_7
     !DEC$endif
     !
@@ -5460,7 +5460,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltmake_dataset_string_f
     !DEC$endif
     !
@@ -5520,7 +5520,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltread_dataset_string_f
     !DEC$endif
     !
@@ -5587,7 +5587,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltset_attribute_int_f
     !DEC$endif
     !
@@ -5654,7 +5654,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltset_attribute_float_f
     !DEC$endif
     !
@@ -5721,7 +5721,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltset_attribute_double_f
     !DEC$endif
     !
@@ -5788,7 +5788,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltset_attribute_string_f
     !DEC$endif
     !
@@ -5857,7 +5857,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltget_attribute_int_f
     !DEC$endif
     !
@@ -5922,7 +5922,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltget_attribute_float_f
     !DEC$endif
     !
@@ -5986,7 +5986,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltget_attribute_double_f
     !DEC$endif
     !
@@ -6050,7 +6050,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltget_attribute_string_f
     !DEC$endif
     !
@@ -6121,7 +6121,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltget_dataset_ndims_f
     !DEC$endif
     !
@@ -6178,7 +6178,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltfind_dataset_f
     !DEC$endif
     !
@@ -6236,7 +6236,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltget_dataset_info_f
     !DEC$endif
     !
@@ -6304,7 +6304,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltget_attribute_ndims_f
     !DEC$endif
     !
@@ -6371,7 +6371,7 @@ CONTAINS
 
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltget_attribute_info_f
     !DEC$endif
     !
@@ -6434,7 +6434,7 @@ CONTAINS
     IMPLICIT NONE
     !
     !This definition is needed for Windows DLLs
-    !DEC$if defined(BUILD_HDF5_DLL)
+    !DEC$if defined(BUILD_HDF5_HL_DLL)
     !DEC$attributes dllexport :: h5ltpath_valid_f
     !DEC$endif
     !
diff --git a/hl/fortran/src/H5TBff.f90 b/hl/fortran/src/H5TBff.f90
index 76bf77c..8d31a93 100644
--- a/hl/fortran/src/H5TBff.f90
+++ b/hl/fortran/src/H5TBff.f90
@@ -96,7 +96,7 @@ SUBROUTINE h5tbmake_table_f(table_title,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbmake_table_f
 !DEC$endif
 !
@@ -219,7 +219,7 @@ SUBROUTINE h5tbwrite_field_name_f_int(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbwrite_field_name_f_int
 !DEC$endif
 !
@@ -295,7 +295,7 @@ SUBROUTINE h5tbwrite_field_name_f_float(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbwrite_field_name_f_float
 !DEC$endif
 !
@@ -373,7 +373,7 @@ SUBROUTINE h5tbwrite_field_name_f_double(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbwrite_field_name_f_double
 !DEC$endif
 !
@@ -449,7 +449,7 @@ SUBROUTINE h5tbwrite_field_name_f_string(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbwrite_field_name_f_string
 !DEC$endif
 !
@@ -526,7 +526,7 @@ SUBROUTINE h5tbread_field_name_f_int(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbread_field_name_f_int
 !DEC$endif
 !
@@ -602,7 +602,7 @@ SUBROUTINE h5tbread_field_name_f_float(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbread_field_name_f_float
 !DEC$endif
 !
@@ -678,7 +678,7 @@ SUBROUTINE h5tbread_field_name_f_double(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbread_field_name_f_double
 !DEC$endif
 !
@@ -754,7 +754,7 @@ SUBROUTINE h5tbread_field_name_f_string(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbread_field_name_f_string
 !DEC$endif
 !
@@ -831,7 +831,7 @@ SUBROUTINE h5tbwrite_field_index_f_int(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbwrite_field_index_f_int
 !DEC$endif
 !
@@ -903,7 +903,7 @@ SUBROUTINE h5tbwrite_field_index_f_float(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbwrite_field_index_f_float
 !DEC$endif
 !
@@ -977,7 +977,7 @@ SUBROUTINE h5tbwrite_field_index_f_double(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbwrite_field_index_f_double
 !DEC$endif
 !
@@ -1049,7 +1049,7 @@ SUBROUTINE h5tbwrite_field_index_f_string(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbwrite_field_index_f_string
 !DEC$endif
 !
@@ -1122,7 +1122,7 @@ SUBROUTINE h5tbread_field_index_f_int(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport ::h5tbread_field_index_f_int
 !DEC$endif
 !
@@ -1194,7 +1194,7 @@ SUBROUTINE h5tbread_field_index_f_float(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbread_field_index_f_float
 !DEC$endif
 !
@@ -1266,7 +1266,7 @@ SUBROUTINE h5tbread_field_index_f_double(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbread_field_index_f_double
 !DEC$endif
 !
@@ -1338,7 +1338,7 @@ SUBROUTINE h5tbread_field_index_f_string(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbread_field_index_f_string
 !DEC$endif
 !
@@ -1409,7 +1409,7 @@ SUBROUTINE h5tbinsert_field_f_int(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbinsert_field_f_int
 !DEC$endif
 !
@@ -1483,7 +1483,7 @@ SUBROUTINE h5tbinsert_field_f_float(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbinsert_field_f_float
 !DEC$endif
 !
@@ -1557,7 +1557,7 @@ SUBROUTINE h5tbinsert_field_f_double(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbinsert_field_f_double
 !DEC$endif
 !
@@ -1632,7 +1632,7 @@ SUBROUTINE h5tbinsert_field_f_string(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbinsert_field_f_string
 !DEC$endif
 !
@@ -1704,7 +1704,7 @@ SUBROUTINE h5tbdelete_field_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbdelete_field_f
 !DEC$endif
 !
@@ -1771,7 +1771,7 @@ SUBROUTINE h5tbget_table_info_f(loc_id,&
 
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbget_table_info_f
 !DEC$endif
 !
@@ -1836,7 +1836,7 @@ SUBROUTINE h5tbget_field_info_f(loc_id,&
   IMPLICIT NONE
 !
 !This definition is needed for Windows DLLs
-!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$if defined(BUILD_HDF5_HL_DLL)
 !DEC$attributes dllexport :: h5tbget_field_info_f
 !DEC$endif
 !