Reorg the examples with CMake command flows like in HDF5 (HDFGroup#469)

* Reorg examples folder and use techniques from HDF5 examples * Move files to examples * remove java examples references
bmribler · Jan 31, 2024 · 427aa23 · 427aa23
1 parent 52a05af
commit 427aa23
Show file tree

Hide file tree

Showing 208 changed files with 904 additions and 727 deletions.
diff --git a/HDF4Examples/hdf/examples/AN/CMakeLists.txt → HDF4Examples/C/AN/CMakeLists.txt b/HDF4Examples/hdf/examples/AN/CMakeLists.txt → HDF4Examples/C/AN/CMakeLists.txt
@@ -1,20 +1,18 @@
 cmake_minimum_required (VERSION 3.12)
-project (HDF4Examples_HDF_AN C)
+project (HDF4Examples_AN C)
 
 #-----------------------------------------------------------------------------
 # Define Sources
 #-----------------------------------------------------------------------------
 include (C_sourcefiles.cmake)
 
-foreach (example ${h4examples})
-  get_filename_component (example_name ${example} NAME_WE)
-  add_executable (hdf_${example_name} ${PROJECT_SOURCE_DIR}/${example})
+foreach (example_name ${h4examples})
+  add_executable (hdf_${example_name} ${PROJECT_SOURCE_DIR}/h4ex_${example_name}.c)
   target_link_libraries (hdf_${example_name} ${H4EX_HDF4_LINK_LIBS})
 endforeach ()
 
-foreach (example ${h4examples_use})
-  get_filename_component (example_name ${example} NAME_WE)
-  add_executable (hdf_${example_name} ${PROJECT_SOURCE_DIR}/${example})
+foreach (example_name ${h4examples_use})
+  add_executable (hdf_${example_name} ${PROJECT_SOURCE_DIR}/h4ex_${example_name}.c)
   target_link_libraries (hdf_${example_name} ${H4EX_HDF4_LINK_LIBS})
 endforeach ()
 
@@ -56,39 +54,37 @@ if (H4EX_BUILD_TESTING)
     endif ()
   endmacro ()
 
-  foreach (example ${h4examples})
-    get_filename_component (example_name ${example} NAME_WE)
-    set (testsrc "${PROJECT_SOURCE_DIR}/testfiles/${example_name}")
-    set (testdest "${PROJECT_BINARY_DIR}/${example_name}")
+  foreach (example_name ${h4examples})
+    set (testsrc "${PROJECT_SOURCE_DIR}/testfiles/h4ex_${example_name}")
+    set (testdest "${PROJECT_BINARY_DIR}/h4ex_${example_name}")
     add_custom_command (
         OUTPUT     "${testdest}.tst"
         COMMAND    ${CMAKE_COMMAND}
         ARGS       -E copy_if_different "${testsrc}.tst" "${testdest}.tst"
         DEPENDS    "${testsrc}.tst"
     )
-    list (APPEND HDF4Examples_HDF_AN_TEST_FILES "${testdest}.tst")
+    list (APPEND HDF4Examples_AN_TEST_FILES "${testdest}.tst")
     if (HDF4_BUILD_TOOLS)
       add_custom_command (
           OUTPUT     "${testdest}.ddl"
           COMMAND    ${CMAKE_COMMAND}
           ARGS       -E copy_if_different "${testsrc}.ddl" "${testdest}.ddl"
           DEPENDS    "${testsrc}.ddl"
       )
-      list (APPEND HDF4Examples_HDF_AN_TEST_FILES "${testdest}.ddl")
+      list (APPEND HDF4Examples_AN_TEST_FILES "${testdest}.ddl")
     endif ()
   endforeach ()
 
-  foreach (example ${h4examples_use})
-    get_filename_component (example_name ${example} NAME_WE)
-    set (testsrc "${PROJECT_SOURCE_DIR}/testfiles/${example_name}")
-    set (testdest "${PROJECT_BINARY_DIR}/${example_name}")
+  foreach (example_name ${h4examples_use})
+    set (testsrc "${PROJECT_SOURCE_DIR}/testfiles/h4ex_${example_name}")
+    set (testdest "${PROJECT_BINARY_DIR}/h4ex_${example_name}")
     add_custom_command (
         OUTPUT     "${testdest}.tst"
         COMMAND    ${CMAKE_COMMAND}
         ARGS       -E copy_if_different "${testsrc}.tst" "${testdest}.tst"
         DEPENDS    "${testsrc}.tst"
     )
-    list (APPEND HDF4Examples_HDF_AN_TEST_FILES "${testdest}.tst")
+    list (APPEND HDF4Examples_AN_TEST_FILES "${testdest}.tst")
   endforeach ()
 
   foreach (ex_file ${h4examples_files})
@@ -100,19 +96,17 @@ if (H4EX_BUILD_TESTING)
         ARGS       -E copy_if_different "${testsrc}" "${testdest}"
         DEPENDS    "${testsrc}"
     )
-    list (APPEND HDF4Examples_HDF_AN_TEST_FILES "${testdest}")
+    list (APPEND HDF4Examples_AN_TEST_FILES "${testdest}")
   endforeach ()
 
   add_custom_target (HDF4Examples_HDF_AN-files ALL COMMENT "Copying files needed by AN tests"
-                    DEPENDS ${HDF4Examples_HDF_AN_TEST_FILES})
+                    DEPENDS ${HDF4Examples_AN_TEST_FILES})
 
-  foreach (example ${h4examples})
-    get_filename_component (example_name ${example} NAME_WE)
+  foreach (example_name ${h4examples})
     ADD_H4_TEST (${example_name} 1 dumpvg)
   endforeach ()
 
-  foreach (example ${h4examples_use})
-    get_filename_component (example_name ${example} NAME_WE)
+  foreach (example_name ${h4examples_use})
     ADD_H4_TEST (${example_name} 0 dumpvg)
   endforeach ()
 endif ()
diff --git a/...mples/hdf/examples/AN/C_sourcefiles.cmake → HDF4Examples/C/AN/C_sourcefiles.cmake b/...mples/hdf/examples/AN/C_sourcefiles.cmake → HDF4Examples/C/AN/C_sourcefiles.cmake
@@ -2,11 +2,11 @@
 # Define Sources, one file per application
 #-----------------------------------------------------------------------------
 set (h4examples
-    h4ex_AN_create_annotation.c
+    AN_create_annotation
 )
 set (h4examples_use
-    h4ex_AN_get_annotation_info.c
-    h4ex_AN_read_annotation.c
+    AN_get_annotation_info
+    AN_read_annotation
 )
 set (h4examples_files
     General_HDFobjects.hdf

diff --git a/...f/examples/AN/h4ex_AN_create_annotation.c → ...Examples/C/AN/h4ex_AN_create_annotation.c b/...f/examples/AN/h4ex_AN_create_annotation.c → ...Examples/C/AN/h4ex_AN_create_annotation.c
diff --git a/...examples/AN/h4ex_AN_get_annotation_info.c → ...amples/C/AN/h4ex_AN_get_annotation_info.c b/...examples/AN/h4ex_AN_get_annotation_info.c → ...amples/C/AN/h4ex_AN_get_annotation_info.c
diff --git a/...hdf/examples/AN/h4ex_AN_read_annotation.c → HDF4Examples/C/AN/h4ex_AN_read_annotation.c b/...hdf/examples/AN/h4ex_AN_read_annotation.c → HDF4Examples/C/AN/h4ex_AN_read_annotation.c
diff --git a/...mples/AN/testfiles/General_HDFobjects.hdf → ...les/C/AN/testfiles/General_HDFobjects.hdf b/...mples/AN/testfiles/General_HDFobjects.hdf → ...les/C/AN/testfiles/General_HDFobjects.hdf
diff --git a/...N/testfiles/h4ex_AN_create_annotation.ddl → ...N/testfiles/h4ex_AN_create_annotation.ddl b/...N/testfiles/h4ex_AN_create_annotation.ddl → ...N/testfiles/h4ex_AN_create_annotation.ddl
diff --git a/...N/testfiles/h4ex_AN_create_annotation.tst → ...N/testfiles/h4ex_AN_create_annotation.tst b/...N/testfiles/h4ex_AN_create_annotation.tst → ...N/testfiles/h4ex_AN_create_annotation.tst
diff --git a/...testfiles/h4ex_AN_get_annotation_info.tst → ...testfiles/h4ex_AN_get_annotation_info.tst b/...testfiles/h4ex_AN_get_annotation_info.tst → ...testfiles/h4ex_AN_get_annotation_info.tst
diff --git a/.../AN/testfiles/h4ex_AN_read_annotation.tst → .../AN/testfiles/h4ex_AN_read_annotation.tst b/.../AN/testfiles/h4ex_AN_read_annotation.tst → .../AN/testfiles/h4ex_AN_read_annotation.tst
diff --git a/HDF4Examples/C/CMakeLists.txt b/HDF4Examples/C/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required (VERSION 3.12)
+project (HDF4Examples_C C)
+
+#-----------------------------------------------------------------------------
+# Define Sources
+#-----------------------------------------------------------------------------
+add_subdirectory (${PROJECT_SOURCE_DIR}/AN)
+add_subdirectory (${PROJECT_SOURCE_DIR}/GR)
+add_subdirectory (${PROJECT_SOURCE_DIR}/VD)
+add_subdirectory (${PROJECT_SOURCE_DIR}/VG)
+add_subdirectory (${PROJECT_SOURCE_DIR}/SD)
diff --git a/HDF4Examples/hdf/examples/GR/CMakeLists.txt → HDF4Examples/C/GR/CMakeLists.txt b/HDF4Examples/hdf/examples/GR/CMakeLists.txt → HDF4Examples/C/GR/CMakeLists.txt
@@ -1,20 +1,18 @@
 cmake_minimum_required (VERSION 3.12)
-project (HDF4Examples_HDF_GR C)
+project (HDF4Examples_GR C)
 
 #-----------------------------------------------------------------------------
 # Define Sources
 #-----------------------------------------------------------------------------
 include (C_sourcefiles.cmake)
 
-foreach (example ${h4examples})
-  get_filename_component (example_name ${example} NAME_WE)
-  add_executable (hdf_${example_name} ${PROJECT_SOURCE_DIR}/${example})
+foreach (example_name ${h4examples})
+  add_executable (hdf_${example_name} ${PROJECT_SOURCE_DIR}/h4ex_${example_name}.c)
   target_link_libraries (hdf_${example_name} ${H4EX_HDF4_LINK_LIBS})
 endforeach ()
 
-foreach (example ${h4examples_use})
-  get_filename_component (example_name ${example} NAME_WE)
-  add_executable (hdf_${example_name} ${PROJECT_SOURCE_DIR}/${example})
+foreach (example_name ${h4examples_use})
+  add_executable (hdf_${example_name} ${PROJECT_SOURCE_DIR}/h4ex_${example_name}.c)
   target_link_libraries (hdf_${example_name} ${H4EX_HDF4_LINK_LIBS})
 endforeach ()
 
@@ -56,39 +54,37 @@ if (H4EX_BUILD_TESTING)
     endif ()
   endmacro ()
 
-  foreach (example ${h4examples})
-    get_filename_component (example_name ${example} NAME_WE)
-    set (testsrc "${PROJECT_SOURCE_DIR}/testfiles/${example_name}")
-    set (testdest "${PROJECT_BINARY_DIR}/${example_name}")
+  foreach (example_name ${h4examples})
+    set (testsrc "${PROJECT_SOURCE_DIR}/testfiles/h4ex_${example_name}")
+    set (testdest "${PROJECT_BINARY_DIR}/h4ex_${example_name}")
     add_custom_command (
         OUTPUT     "${testdest}.tst"
         COMMAND    ${CMAKE_COMMAND}
         ARGS       -E copy_if_different "${testsrc}.tst" "${testdest}.tst"
         DEPENDS    "${testsrc}.tst"
     )
-    list (APPEND HDF4Examples_HDF_GR_TEST_FILES "${testdest}.tst")
+    list (APPEND HDF4Examples_GR_TEST_FILES "${testdest}.tst")
     if (HDF4_BUILD_TOOLS)
       add_custom_command (
           OUTPUT     "${testdest}.ddl"
           COMMAND    ${CMAKE_COMMAND}
           ARGS       -E copy_if_different "${testsrc}.ddl" "${testdest}.ddl"
           DEPENDS    "${testsrc}.ddl"
       )
-      list (APPEND HDF4Examples_HDF_GR_TEST_FILES "${testdest}.ddl")
+      list (APPEND HDF4Examples_GR_TEST_FILES "${testdest}.ddl")
     endif ()
   endforeach ()
 
-  foreach (example ${h4examples_use})
-    get_filename_component (example_name ${example} NAME_WE)
-    set (testsrc "${PROJECT_SOURCE_DIR}/testfiles/${example_name}")
-    set (testdest "${PROJECT_BINARY_DIR}/${example_name}")
+  foreach (example_name ${h4examples_use})
+    set (testsrc "${PROJECT_SOURCE_DIR}/testfiles/h4ex_${example_name}")
+    set (testdest "${PROJECT_BINARY_DIR}/h4ex_${example_name}")
     add_custom_command (
         OUTPUT     "${testdest}.tst"
         COMMAND    ${CMAKE_COMMAND}
         ARGS       -E copy_if_different "${testsrc}.tst" "${testdest}.tst"
         DEPENDS    "${testsrc}.tst"
     )
-    list (APPEND HDF4Examples_HDF_GR_TEST_FILES "${testdest}.tst")
+    list (APPEND HDF4Examples_GR_TEST_FILES "${testdest}.tst")
   endforeach ()
 
   foreach (ex_file ${h4examples_files})
@@ -100,19 +96,17 @@ if (H4EX_BUILD_TESTING)
         ARGS       -E copy_if_different "${testsrc}" "${testdest}"
         DEPENDS    "${testsrc}"
     )
-    list (APPEND HDF4Examples_HDF_GR_TEST_FILES "${testdest}")
+    list (APPEND HDF4Examples_GR_TEST_FILES "${testdest}")
   endforeach ()
 
   add_custom_target (HDF4Examples_HDF_GR-files ALL COMMENT "Copying files needed by GR tests"
-                    DEPENDS ${HDF4Examples_HDF_GR_TEST_FILES})
+                    DEPENDS ${HDF4Examples_GR_TEST_FILES})
 
-  foreach (example ${h4examples})
-    get_filename_component (example_name ${example} NAME_WE)
+  foreach (example_name ${h4examples})
     ADD_H4_TEST (${example_name} 1 dumpvg)
   endforeach ()
 
-  foreach (example ${h4examples_use})
-    get_filename_component (example_name ${example} NAME_WE)
+  foreach (example_name ${h4examples_use})
     ADD_H4_TEST (${example_name} 0 dumpvg)
   endforeach ()
 endif ()
diff --git a/...mples/hdf/examples/GR/C_sourcefiles.cmake → HDF4Examples/C/GR/C_sourcefiles.cmake b/...mples/hdf/examples/GR/C_sourcefiles.cmake → HDF4Examples/C/GR/C_sourcefiles.cmake
@@ -2,17 +2,17 @@
 # Define Sources, one file per application
 #-----------------------------------------------------------------------------
 set (h4examples
-    h4ex_GR_create_and_write_chunked_image.c
-    h4ex_GR_create_and_write_image.c
-    h4ex_GR_write_palette.c
+    GR_create_and_write_chunked_image
+    GR_create_and_write_image
+    GR_write_palette
 )
 set (h4examples_use
-    h4ex_GR_get_attribute.c
-    h4ex_GR_image_info.c
-    h4ex_GR_modify_image.c
-    h4ex_GR_read_image.c
-    h4ex_GR_read_palette.c
-    h4ex_GR_set_attribute.c
+    GR_get_attribute
+    GR_image_info
+    GR_modify_image
+    GR_read_image
+    GR_read_palette
+    GR_set_attribute
 )
 set (h4examples_files
     General_RImages.hdf

diff --git a/.../h4ex_GR_create_and_write_chunked_image.c → .../h4ex_GR_create_and_write_chunked_image.c b/.../h4ex_GR_create_and_write_chunked_image.c → .../h4ex_GR_create_and_write_chunked_image.c
diff --git a/...mples/GR/h4ex_GR_create_and_write_image.c → ...les/C/GR/h4ex_GR_create_and_write_image.c b/...mples/GR/h4ex_GR_create_and_write_image.c → ...les/C/GR/h4ex_GR_create_and_write_image.c
diff --git a/...s/hdf/examples/GR/h4ex_GR_get_attribute.c → HDF4Examples/C/GR/h4ex_GR_get_attribute.c b/...s/hdf/examples/GR/h4ex_GR_get_attribute.c → HDF4Examples/C/GR/h4ex_GR_get_attribute.c
diff --git a/...ples/hdf/examples/GR/h4ex_GR_image_info.c → HDF4Examples/C/GR/h4ex_GR_image_info.c b/...ples/hdf/examples/GR/h4ex_GR_image_info.c → HDF4Examples/C/GR/h4ex_GR_image_info.c
diff --git a/...es/hdf/examples/GR/h4ex_GR_modify_image.c → HDF4Examples/C/GR/h4ex_GR_modify_image.c b/...es/hdf/examples/GR/h4ex_GR_modify_image.c → HDF4Examples/C/GR/h4ex_GR_modify_image.c
diff --git a/...ples/hdf/examples/GR/h4ex_GR_read_image.c → HDF4Examples/C/GR/h4ex_GR_read_image.c b/...ples/hdf/examples/GR/h4ex_GR_read_image.c → HDF4Examples/C/GR/h4ex_GR_read_image.c
diff --git a/...es/hdf/examples/GR/h4ex_GR_read_palette.c → HDF4Examples/C/GR/h4ex_GR_read_palette.c b/...es/hdf/examples/GR/h4ex_GR_read_palette.c → HDF4Examples/C/GR/h4ex_GR_read_palette.c
diff --git a/...s/hdf/examples/GR/h4ex_GR_set_attribute.c → HDF4Examples/C/GR/h4ex_GR_set_attribute.c b/...s/hdf/examples/GR/h4ex_GR_set_attribute.c → HDF4Examples/C/GR/h4ex_GR_set_attribute.c
diff --git a/...s/hdf/examples/GR/h4ex_GR_write_palette.c → HDF4Examples/C/GR/h4ex_GR_write_palette.c b/...s/hdf/examples/GR/h4ex_GR_write_palette.c → HDF4Examples/C/GR/h4ex_GR_write_palette.c
diff --git a/...examples/GR/testfiles/General_RImages.hdf → ...amples/C/GR/testfiles/General_RImages.hdf b/...examples/GR/testfiles/General_RImages.hdf → ...amples/C/GR/testfiles/General_RImages.hdf
diff --git a/...xamples/GR/testfiles/General_RImages2.hdf → ...mples/C/GR/testfiles/General_RImages2.hdf b/...xamples/GR/testfiles/General_RImages2.hdf → ...mples/C/GR/testfiles/General_RImages2.hdf
diff --git a/...xamples/GR/testfiles/General_RImages3.hdf → ...mples/C/GR/testfiles/General_RImages3.hdf b/...xamples/GR/testfiles/General_RImages3.hdf → ...mples/C/GR/testfiles/General_RImages3.hdf
diff --git a/...xamples/GR/testfiles/General_RImages4.hdf → ...mples/C/GR/testfiles/General_RImages4.hdf b/...xamples/GR/testfiles/General_RImages4.hdf → ...mples/C/GR/testfiles/General_RImages4.hdf
diff --git a/...mples/GR/testfiles/Image_with_Palette.hdf → ...les/C/GR/testfiles/Image_with_Palette.hdf b/...mples/GR/testfiles/Image_with_Palette.hdf → ...les/C/GR/testfiles/Image_with_Palette.hdf
diff --git a/...4ex_GR_create_and_write_chunked_image.ddl → ...4ex_GR_create_and_write_chunked_image.ddl b/...4ex_GR_create_and_write_chunked_image.ddl → ...4ex_GR_create_and_write_chunked_image.ddl
diff --git a/...4ex_GR_create_and_write_chunked_image.tst → ...4ex_GR_create_and_write_chunked_image.tst b/...4ex_GR_create_and_write_chunked_image.tst → ...4ex_GR_create_and_write_chunked_image.tst
diff --git a/...tfiles/h4ex_GR_create_and_write_image.ddl → ...tfiles/h4ex_GR_create_and_write_image.ddl b/...tfiles/h4ex_GR_create_and_write_image.ddl → ...tfiles/h4ex_GR_create_and_write_image.ddl
diff --git a/...tfiles/h4ex_GR_create_and_write_image.tst → ...tfiles/h4ex_GR_create_and_write_image.tst b/...tfiles/h4ex_GR_create_and_write_image.tst → ...tfiles/h4ex_GR_create_and_write_image.tst
diff --git a/...es/GR/testfiles/h4ex_GR_get_attribute.tst → .../C/GR/testfiles/h4ex_GR_get_attribute.tst b/...es/GR/testfiles/h4ex_GR_get_attribute.tst → .../C/GR/testfiles/h4ex_GR_get_attribute.tst
diff --git a/...mples/GR/testfiles/h4ex_GR_image_info.tst → ...les/C/GR/testfiles/h4ex_GR_image_info.tst b/...mples/GR/testfiles/h4ex_GR_image_info.tst → ...les/C/GR/testfiles/h4ex_GR_image_info.tst
diff --git a/...les/GR/testfiles/h4ex_GR_modify_image.tst → ...s/C/GR/testfiles/h4ex_GR_modify_image.tst b/...les/GR/testfiles/h4ex_GR_modify_image.tst → ...s/C/GR/testfiles/h4ex_GR_modify_image.tst
diff --git a/...mples/GR/testfiles/h4ex_GR_read_image.tst → ...les/C/GR/testfiles/h4ex_GR_read_image.tst b/...mples/GR/testfiles/h4ex_GR_read_image.tst → ...les/C/GR/testfiles/h4ex_GR_read_image.tst
diff --git a/...les/GR/testfiles/h4ex_GR_read_palette.tst → ...s/C/GR/testfiles/h4ex_GR_read_palette.tst b/...les/GR/testfiles/h4ex_GR_read_palette.tst → ...s/C/GR/testfiles/h4ex_GR_read_palette.tst
diff --git a/...es/GR/testfiles/h4ex_GR_set_attribute.tst → .../C/GR/testfiles/h4ex_GR_set_attribute.tst b/...es/GR/testfiles/h4ex_GR_set_attribute.tst → .../C/GR/testfiles/h4ex_GR_set_attribute.tst
diff --git a/...es/GR/testfiles/h4ex_GR_write_palette.ddl → .../C/GR/testfiles/h4ex_GR_write_palette.ddl b/...es/GR/testfiles/h4ex_GR_write_palette.ddl → .../C/GR/testfiles/h4ex_GR_write_palette.ddl
diff --git a/...es/GR/testfiles/h4ex_GR_write_palette.tst → .../C/GR/testfiles/h4ex_GR_write_palette.tst b/...es/GR/testfiles/h4ex_GR_write_palette.tst → .../C/GR/testfiles/h4ex_GR_write_palette.tst
diff --git a/HDF4Examples/hdf/examples/Makefile.am → HDF4Examples/C/Makefile.am b/HDF4Examples/hdf/examples/Makefile.am → HDF4Examples/C/Makefile.am
@@ -36,7 +36,7 @@ INSTALL_FILES= h4ex_VD_create_vdatas.c h4ex_VD_write_mixed_vdata.c		\
 	h4ex_AN_create_annotation.c h4ex_AN_get_annotation_info.c h4ex_AN_read_annotation.c
 
 # Where to install example files
-EXAMPLEDIR=$(prefix)/examples/hdf
+EXAMPLEDIR=$(prefix)/HDF4Examples/C
 
 # How to build C programs using h4cc
 $(EXTRA_PROG): $(H4CC)

diff --git a/HDF4Examples/mfhdf/examples/CMakeLists.txt → HDF4Examples/C/SD/CMakeLists.txt b/HDF4Examples/mfhdf/examples/CMakeLists.txt → HDF4Examples/C/SD/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.12)
-project (HDF4Examples_MFHDF C)
+project (HDF4Examples_SD C)
 
 #-----------------------------------------------------------------------------
 # Define Sources
@@ -27,9 +27,8 @@ if (H4EX_BUILD_TESTING)
   set (last_test "MFHDF_EXAMPLES-clearall-objects")
 endif ()
 
-foreach (example ${examples})
-  get_filename_component (example_name ${example} NAME_WE)
-  add_executable (mf_${example_name} ${PROJECT_SOURCE_DIR}/${example})
+foreach (example_name ${examples})
+  add_executable (mf_${example_name} ${PROJECT_SOURCE_DIR}/h4ex_${example_name}.c)
   target_link_libraries (mf_${example_name} ${H4EX_HDF4_LINK_LIBS})
   if (H4EX_BUILD_TESTING)
     add_test (

diff --git a/HDF4Examples/C/SD/C_sourcefiles.cmake b/HDF4Examples/C/SD/C_sourcefiles.cmake
@@ -0,0 +1,21 @@
+#-----------------------------------------------------------------------------
+# Define Sources, one file per application
+#-----------------------------------------------------------------------------
+set (examples
+    SD_create_sds
+    SD_write_to_sds
+    SD_write_slab
+    SD_alter_sds_values
+    SD_unlimited_sds
+    SD_compress_sds
+    SD_mv_sds_to_external
+    SD_read_from_sds
+    SD_read_subsets
+    SD_get_info
+    SD_find_sds_by_name
+    SD_set_get_dim_info
+    SD_dimscale_vs_sds
+    SD_set_attr
+    SD_get_attr
+    SD_chunking_example
+)
diff --git a/HDF4Examples/mfhdf/examples/Makefile.am → HDF4Examples/C/SD/Makefile.am b/HDF4Examples/mfhdf/examples/Makefile.am → HDF4Examples/C/SD/Makefile.am
diff --git a/...mfhdf/examples/h4ex_SD_alter_sds_values.c → HDF4Examples/C/SD/h4ex_SD_alter_sds_values.c b/...mfhdf/examples/h4ex_SD_alter_sds_values.c → HDF4Examples/C/SD/h4ex_SD_alter_sds_values.c
diff --git a/...mfhdf/examples/h4ex_SD_chunking_example.c → HDF4Examples/C/SD/h4ex_SD_chunking_example.c b/...mfhdf/examples/h4ex_SD_chunking_example.c → HDF4Examples/C/SD/h4ex_SD_chunking_example.c
diff --git a/...les/mfhdf/examples/h4ex_SD_compress_sds.c → HDF4Examples/C/SD/h4ex_SD_compress_sds.c b/...les/mfhdf/examples/h4ex_SD_compress_sds.c → HDF4Examples/C/SD/h4ex_SD_compress_sds.c
diff --git a/...mples/mfhdf/examples/h4ex_SD_create_sds.c → HDF4Examples/C/SD/h4ex_SD_create_sds.c b/...mples/mfhdf/examples/h4ex_SD_create_sds.c → HDF4Examples/C/SD/h4ex_SD_create_sds.c
diff --git a/.../mfhdf/examples/h4ex_SD_dimscale_vs_sds.c → HDF4Examples/C/SD/h4ex_SD_dimscale_vs_sds.c b/.../mfhdf/examples/h4ex_SD_dimscale_vs_sds.c → HDF4Examples/C/SD/h4ex_SD_dimscale_vs_sds.c
diff --git a/...mfhdf/examples/h4ex_SD_find_sds_by_name.c → HDF4Examples/C/SD/h4ex_SD_find_sds_by_name.c b/...mfhdf/examples/h4ex_SD_find_sds_by_name.c → HDF4Examples/C/SD/h4ex_SD_find_sds_by_name.c
diff --git a/...xamples/mfhdf/examples/h4ex_SD_get_attr.c → HDF4Examples/C/SD/h4ex_SD_get_attr.c b/...xamples/mfhdf/examples/h4ex_SD_get_attr.c → HDF4Examples/C/SD/h4ex_SD_get_attr.c
diff --git a/...xamples/mfhdf/examples/h4ex_SD_get_info.c → HDF4Examples/C/SD/h4ex_SD_get_info.c b/...xamples/mfhdf/examples/h4ex_SD_get_info.c → HDF4Examples/C/SD/h4ex_SD_get_info.c
diff --git a/...hdf/examples/h4ex_SD_mv_sds_to_external.c → ...xamples/C/SD/h4ex_SD_mv_sds_to_external.c b/...hdf/examples/h4ex_SD_mv_sds_to_external.c → ...xamples/C/SD/h4ex_SD_mv_sds_to_external.c
diff --git a/...es/mfhdf/examples/h4ex_SD_read_from_sds.c → HDF4Examples/C/SD/h4ex_SD_read_from_sds.c b/...es/mfhdf/examples/h4ex_SD_read_from_sds.c → HDF4Examples/C/SD/h4ex_SD_read_from_sds.c
diff --git a/...les/mfhdf/examples/h4ex_SD_read_subsets.c → HDF4Examples/C/SD/h4ex_SD_read_subsets.c b/...les/mfhdf/examples/h4ex_SD_read_subsets.c → HDF4Examples/C/SD/h4ex_SD_read_subsets.c
diff --git a/...xamples/mfhdf/examples/h4ex_SD_set_attr.c → HDF4Examples/C/SD/h4ex_SD_set_attr.c b/...xamples/mfhdf/examples/h4ex_SD_set_attr.c → HDF4Examples/C/SD/h4ex_SD_set_attr.c
diff --git a/...mfhdf/examples/h4ex_SD_set_get_dim_info.c → HDF4Examples/C/SD/h4ex_SD_set_get_dim_info.c b/...mfhdf/examples/h4ex_SD_set_get_dim_info.c → HDF4Examples/C/SD/h4ex_SD_set_get_dim_info.c
diff --git a/...es/mfhdf/examples/h4ex_SD_unlimited_sds.c → HDF4Examples/C/SD/h4ex_SD_unlimited_sds.c b/...es/mfhdf/examples/h4ex_SD_unlimited_sds.c → HDF4Examples/C/SD/h4ex_SD_unlimited_sds.c
diff --git a/...mples/mfhdf/examples/h4ex_SD_write_slab.c → HDF4Examples/C/SD/h4ex_SD_write_slab.c b/...mples/mfhdf/examples/h4ex_SD_write_slab.c → HDF4Examples/C/SD/h4ex_SD_write_slab.c
diff --git a/...les/mfhdf/examples/h4ex_SD_write_to_sds.c → HDF4Examples/C/SD/h4ex_SD_write_to_sds.c b/...les/mfhdf/examples/h4ex_SD_write_to_sds.c → HDF4Examples/C/SD/h4ex_SD_write_to_sds.c
diff --git a/...xamples/mfhdf/examples/testexamples.sh.in → HDF4Examples/C/SD/testexamples.sh.in b/...xamples/mfhdf/examples/testexamples.sh.in → HDF4Examples/C/SD/testexamples.sh.in