HDFFV-9994 port changes from develop.

CMake folder changes brought up to standard.

tools/h5diff/Makefile.am

@@ -44,6 +44,11 @@ check_PROGRAMS=$(TEST_PROG)
 check_SCRIPTS=$(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
 # The parallel test script testph5diff.sh actually depends on testh5diff.sh.
 SCRIPT_DEPEND=h5diff$(EXEEXT) $(H5PDIFF) testh5diff.sh
+if HAVE_SHARED_CONDITIONAL
+if USE_PLUGINS_CONDITIONAL
+   TEST_SCRIPT += h5diff_plugin.sh
+endif
+endif
 
 # Source files for the program
 h5diff_SOURCES=h5diff_main.c h5diff_common.c
@@ -53,9 +58,20 @@ h5diffgentest_SOURCES=h5diffgentest.c
 # Programs depend on the main HDF5 library and tools library
 LDADD=$(LIBH5TOOLS) $(LIBHDF5)
 
+if HAVE_SHARED_CONDITIONAL
+  # Build it as shared library if configure is enabled for shared library.
+  lib_LTLIBRARIES=libdynlibdiff.la
+  libdynlibdiff_la_SOURCES=dynlib_diff.c
+
+install-exec-hook:
+	$(RM) $(DESTDIR)$(libdir)/*dynlib*
+endif
+
 # Temporary files.  *.h5 are generated by h5diff.  They should
 # be copied to the testfiles/ directory if update is required
 CHECK_CLEANFILES+=*.h5 expect_sorted actual_sorted
 
+DISTCLEANFILES=h5diff_plugin.sh
+
 include $(top_srcdir)/config/conclude.am