From 0b226bd28beb02165f18a9e3fdc985028ce37946 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 18 Apr 2017 11:04:22 -0500
Subject: HDFFV-10170 undo patch

---
 test/Makefile.am                | 13 ++++++-------
 tools/test/h5dump/Makefile.am   |  3 ++-
 tools/test/h5repack/Makefile.am |  5 ++++-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/test/Makefile.am b/test/Makefile.am
index 376291a..79dc17f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -100,13 +100,13 @@ if BUILD_ALL_CONDITIONAL
   noinst_PROGRAMS=$(BUILD_ALL_PROGS)
 endif
 
-if HAVE_SHARED_CONDITIONAL
-  # The libh5test library provides common support code for the tests.
-  noinst_LTLIBRARIES=libh5test.la
+# The libh5test library provides common support code for the tests.
+noinst_LTLIBRARIES=libh5test.la
 
+if HAVE_SHARED_CONDITIONAL
   # The libdynlib1, libdynlib2, libdynlib3, and libdynlib4 library for testing plugin module plugin.c.
   # Build it as shared library if configure is enabled for shared library.
-  noinst_LTLIBRARIES+=libdynlib1.la libdynlib2.la libdynlib3.la libdynlib4.la
+  lib_LTLIBRARIES=libdynlib1.la libdynlib2.la libdynlib3.la libdynlib4.la
   libdynlib1_la_SOURCES=dynlib1.c
   libdynlib2_la_SOURCES=dynlib2.c
   libdynlib3_la_SOURCES=dynlib3.c
@@ -116,9 +116,8 @@ if HAVE_SHARED_CONDITIONAL
   libdynlib3_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
   libdynlib4_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
 
-else
-  # The libh5test library provides common support code for the tests.
-  noinst_LTLIBRARIES=libh5test.la
+install-exec-hook:
+	$(RM) $(DESTDIR)$(libdir)/*dynlib*
 endif
 
 libh5test_la_SOURCES=h5test.c testframe.c cache_common.c swmr_common.c
diff --git a/tools/test/h5dump/Makefile.am b/tools/test/h5dump/Makefile.am
index 6d8205d..8723c65 100644
--- a/tools/test/h5dump/Makefile.am
+++ b/tools/test/h5dump/Makefile.am
@@ -41,9 +41,10 @@ LDADD=$(LIBH5TOOLS) $(LIBHDF5)
 
 if HAVE_SHARED_CONDITIONAL
   # Build it as shared library if configure is enabled for shared library.
-  noinst_LTLIBRARIES=libdynlibdump.la
+  lib_LTLIBRARIES=libdynlibdump.la
   libdynlibdump_la_SOURCES=dynlib_dump.c
   libdynlibdump_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
+
 install-exec-hook:
 	$(RM) $(DESTDIR)$(libdir)/*dynlib*
 endif
diff --git a/tools/test/h5repack/Makefile.am b/tools/test/h5repack/Makefile.am
index a15f4a6..375df47 100644
--- a/tools/test/h5repack/Makefile.am
+++ b/tools/test/h5repack/Makefile.am
@@ -47,11 +47,14 @@ h5repacktst_SOURCES=h5repacktst.c
 
 if HAVE_SHARED_CONDITIONAL
   # Build it as shared library if configure is enabled for shared library.
-  noinst_LTLIBRARIES=libdynlibadd.la libdynlibvers.la
+  lib_LTLIBRARIES=libdynlibadd.la libdynlibvers.la
   libdynlibadd_la_SOURCES=dynlib_rpk.c
   libdynlibvers_la_SOURCES=dynlib_vrpk.c
   libdynlibadd_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
   libdynlibvers_la_LDFLAGS = -avoid-version -module -shared -export-dynamic
+
+install-exec-hook:
+	$(RM) $(DESTDIR)$(libdir)/*dynlib*
 endif
 
 # Temporary files.  *.h5 are generated by h5repack.  They should
-- 
cgit v0.12