[svn-r26378] Bring revisions #26220 - #26324 from trunk to revise_chunks. h5committested.

25 files changed, 308 insertions, 185 deletions

diff --git a/hl/Makefile.in b/hl/Makefile.in
index 6ca0805..f3d6c04 100644
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -665,8 +665,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 @BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran
 @BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++
 @BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src test tools $(CXX_DIR) $(FORTRAN_DIR)
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index f16130a..0367469 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -661,8 +661,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 SUBDIRS = src test
 DIST_SUBDIRS = src test examples
 
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index 83f07f2..a9ecd9e 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -608,8 +608,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5
 
 # These are the programs that 'make all' or 'make prog' will build and
 # which 'make check' will run.  List them in the order they should be run.
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 98110b9..7e8c4ba 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -667,8 +667,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 7e50ec4..1160548 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -664,8 +664,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 
 # These are our main targets.  They should be listed in the order to be
 # executed, generally most specific tests to least specific tests.
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index 43c6e3c..92a8301 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -608,8 +608,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5
 @BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = 
 
 # Example directory
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/Makefile.in b/hl/fortran/Makefile.in
index ff02a60..7c6f2e2 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -665,8 +665,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 SUBDIRS = src test
 DIST_SUBDIRS = src test examples
 
diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in
index 27b1dee..af5a18a 100644
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@@ -608,8 +608,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5
 
 # Compile parallel fortran examples only if parallel is enabled
 @BUILD_PARALLEL_CONDITIONAL_TRUE@EXAMPLE_PROG_PARA = 
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
 !
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 6979867..3ccfb9d 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -682,8 +682,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 50b8780..e1b28a5 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -673,11 +673,11 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
+# *.clog and *.clog2 are from the MPE option.
 
 # Temporary files.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog dsetf[1-5].h5 f1img.h5 \
-	f1tab.h5 tstds.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 dsetf[1-5].h5 \
+	f1img.h5 f1tab.h5 tstds.h5
 
 # Our main target, the test programs
 TEST_PROG = tstds tstlite tstimage tsttable
diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c
index ed725a3..9d6123b 100644
--- a/hl/src/H5LT.c
+++ b/hl/src/H5LT.c
@@ -1981,7 +1981,8 @@ find_attr(hid_t loc_id, const char *name, const H5A_info_t *ainfo,
     * cause the iterator to immediately return that positive value,
     * indicating short-circuit success
     */
-    if(HDstrncmp(name, (char *)op_data, HDstrlen((char *)op_data)) == 0)
+
+    if(HDstrncmp(name, (char *)op_data, MAX(HDstrlen((char *)op_data),HDstrlen(name))) == 0)
         ret = H5_ITER_STOP;
 
     return ret;
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index 7a0bc20..6ed1ac0 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -130,6 +130,9 @@ hid_t H5PTcreate_fl ( hid_t loc_id,
   if((table->type_id = H5Tcopy(dtype_id)) < 0)
     goto out;
 
+  if((table->type_id = H5Tget_native_type(table->type_id, H5T_DIR_DEFAULT)) < 0)
+    goto out;
+
   H5PT_create_index(table);
   table->size = 0;
 
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index d69d673..490f639 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -663,8 +663,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index b0651ad..9bb1593 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -714,14 +714,14 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
+# *.clog and *.clog2 are from the MPE option.
 
 # Temporary files.  These files are the ones created by running `make test'.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog combine_tables[1-2].h5 \
-	test_ds[1-9].h5 test_ds10.h5 test_image[1-3].h5 \
-	file_img[1-2].h5 test_lite[1-4].h5 test_table.h5 \
-	test_packet_table.h5 test_packet_compress.h5 test_detach.h5 \
-	test_dectris.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 \
+	combine_tables[1-2].h5 test_ds[1-9].h5 test_ds10.h5 \
+	test_image[1-3].h5 file_img[1-2].h5 test_lite[1-4].h5 \
+	test_table.h5 test_packet_table.h5 test_packet_compress.h5 \
+	test_detach.h5 test_dectris.h5
 
 # Test script
 TEST_SCRIPT = test_ld.sh
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
index d61d6cf..19d3759 100644
--- a/hl/test/test_lite.c
+++ b/hl/test/test_lite.c
@@ -36,10 +36,12 @@
 
 #define DIM 6
 
+#define ATTR_NAME_SUB "att"
 #define ATTR1_NAME "attr string"
 #define ATTR2_NAME "attr char"
 #define ATTR3_NAME "attr short"
 #define ATTR4_NAME "attr int"
+#define ATTR_NAME_EXT "att int ext"
 #define ATTR5_NAME "attr long"
 #define ATTR6_NAME "attr uchar"
 #define ATTR7_NAME "attr ushort"
@@ -646,6 +648,14 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
     if ( H5LTset_attribute_int( loc_id, obj_name, ATTR4_NAME, attr_int_in, (size_t)5 ) < 0 )
         return -1;
 
+    /* Set the attribute which is a substring of an existing attribute */
+    if ( H5LTset_attribute_int( loc_id, obj_name, ATTR_NAME_SUB, attr_int_in, (size_t)5 ) < 0 )
+        return -1;
+
+    /* Set the attribute which is an extension of an existing attribute */
+    if ( H5LTset_attribute_int( loc_id, obj_name, ATTR_NAME_EXT, attr_int_in, (size_t)5 ) < 0 )
+        return -1;
+
     PASSED();
 
     /*-------------------------------------------------------------------------
@@ -666,6 +676,26 @@ static herr_t make_attributes( hid_t loc_id, const char* obj_name )
         }
     }
 
+    if ( H5LTget_attribute_int( loc_id, obj_name, ATTR_NAME_SUB, attr_int_out ) < 0 )
+        return -1;
+
+    for (i = 0; i < 5; i++)
+    {
+        if ( attr_int_in[i] != attr_int_out[i] ) {
+            return -1;
+        }
+    }
+
+    if ( H5LTget_attribute_int( loc_id, obj_name, ATTR_NAME_EXT, attr_int_out ) < 0 )
+        return -1;
+
+    for (i = 0; i < 5; i++)
+    {
+        if ( attr_int_in[i] != attr_int_out[i] ) {
+            return -1;
+        }
+    }
+
     /* Get the attribute */
     if ( H5LTget_attribute( loc_id, obj_name, ATTR4_NAME, H5T_NATIVE_INT, attr_int_out ) < 0 )
         return -1;
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c
index 9d3074d..c7a1c27 100644
--- a/hl/test/test_packet.c
+++ b/hl/test/test_packet.c
@@ -895,6 +895,92 @@ error:
     return -1;
 }
 
+/*-------------------------------------------------------------------------
+ * test_rw_non-native_dt
+ *
+ * test reading and writing packet table using datatypes that are not
+ * native.
+ *
+ *-------------------------------------------------------------------------
+ */
+static int test_rw_nonnative_dt(hid_t fid)
+{
+ hid_t          ptable;     /* Packet table identifier */
+
+ herr_t         err;        /* Function return status */
+ hsize_t        count;      /* Number of records in the table */
+
+ int            x;          /* Loop variable */
+
+ /* Buffers to hold data */
+ int writeBuffer[5];
+ int readBuffer[5];
+
+ TESTING("reading/writing non-native packet table");
+
+ /* Initialize buffers */
+ for(x=0; x<5; x++) {
+   writeBuffer[x]=x;
+   readBuffer[x] = -1;
+ }
+
+ /* Create a fixed-length packet table within the file */
+ /* This table's "packets" will be simple integers and it will use no compression */
+ if(H5Tget_order(H5T_NATIVE_INT) == H5T_ORDER_LE) {
+   ptable = H5PTcreate_fl(fid, "Packet Test Dataset, Non-native", H5T_STD_I32BE, (hsize_t)100, -1);
+ } else {
+   ptable = H5PTcreate_fl(fid, "Packet Test Dataset, Non-native", H5T_STD_I32LE, (hsize_t)100, -1);
+ }
+ if(ptable == H5I_INVALID_HID)
+   goto out;
+
+ /* Write one packet to the packet table */
+ if( (err = H5PTappend(ptable, (hsize_t)1, &(writeBuffer[0]))) < 0 )
+   goto out;
+
+ /* Write several packets to the packet table */
+ if( (err = H5PTappend(ptable, (hsize_t)4, &(writeBuffer[1]))) < 0)
+   goto out;
+
+ if( (err = H5PTclose(ptable)) < 0)
+   goto out;
+
+ /* Open the Packet table */
+ if( (ptable = H5PTopen(fid, "Packet Test Dataset, Non-native")) < 0)
+   goto out;
+
+ /* Get the number of packets in the packet table.  This should be five. */
+ if( (err = H5PTget_num_packets(ptable, &count)) < 0)
+   goto out;
+
+ if( (int)count != 5 )
+   goto out;
+
+ /* Initialize packet table's "current record" */
+ if( (err = H5PTcreate_index(ptable)) < 0)
+   goto out;
+
+ /* Iterate through packets, read each one back */
+ for(x=0; x<5; x++) {
+   if( (err = H5PTget_next(ptable, (hsize_t)1, &(readBuffer[x]))) < 0)
+     goto out;
+   if( x != readBuffer[x])
+     goto out;
+ }
+
+ /* Close the packet table */
+ if( (err = H5PTclose(ptable)) < 0)
+   goto out;
+ 
+ PASSED();
+ return 0;
+
+ out:
+     H5_FAILED();
+     if( H5PTis_valid(ptable) < 0)
+       H5PTclose(ptable);
+     return -1;
+}
 
 /*-------------------------------------------------------------------------
  * test_error
@@ -1035,6 +1121,7 @@ static int test_packet_table(hid_t fid)
     test_read(fid);
     test_get_next(fid);
     test_big_table(fid);
+    test_rw_nonnative_dt(fid);
 #ifdef VLPT_REMOVED
     test_varlen(fid);
 #endif /* VLPT_REMOVED */
diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in
index 2490588..60ed15793 100644
--- a/hl/tools/Makefile.in
+++ b/hl/tools/Makefile.in
@@ -662,8 +662,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2
 CONFIG = ordered
 
 # All subdirectories
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 2317975..b8fdd3a 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -676,8 +676,8 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5 *.gif
+# *.clog and *.clog2 are from the MPE option.
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 *.gif
 
 # These are our main targets, the tools
 TEST_SCRIPT = h52giftest.sh
diff --git a/hl/tools/h5watch/Makefile.in b/hl/tools/h5watch/Makefile.in
index c76798f..9f0dba0 100644
--- a/hl/tools/h5watch/Makefile.in
+++ b/hl/tools/h5watch/Makefile.in
@@ -673,9 +673,9 @@ TRACE = perl $(top_srcdir)/bin/trace
 
 # .chkexe files are used to mark tests that have run successfully.
 # .chklog files are output from those tests.
-# *.clog are from the MPE option.
+# *.clog and *.clog2 are from the MPE option.
 #
-CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.h5
+CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5
 
 # These are our main targets, the tools
 TEST_SCRIPT = testh5watch.sh