[libvirt] [PATCH] src: Move DLOPEN_LIBS to libraries introducing the dependency

Michal Privoznik mprivozn at redhat.com
Fri Aug 10 05:45:11 UTC 2018


There are few places where dlopen() is called. This call means we
have to link with DLOPEN_LIBS. However, instead of having each
final, installable library linking with it, move the directive to
the source that introduced the dependency.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/Makefile.am          | 2 ++
 src/util/Makefile.inc.am | 1 +
 tools/Makefile.am        | 4 ++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index a4f213480e..61876cf382 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -752,6 +752,7 @@ libvirt_setuid_rpc_client_la_CFLAGS = \
 		$(AM_CFLAGS) \
 		$(SECDRIVER_CFLAGS) \
 		$(XDR_CFLAGS) \
+		$(DLOPEN_LIBS) \
 		$(NULL)
 endif WITH_SETUID_RPC_CLIENT
 
@@ -1000,6 +1001,7 @@ libvirt_nss_la_CFLAGS = \
 		$(NULL)
 libvirt_nss_la_LDFLAGS = \
 		$(AM_LDFLAGS) \
+		$(DLOPEN_LIBS) \
 		$(NULL)
 endif WITH_NSS
 
diff --git a/src/util/Makefile.inc.am b/src/util/Makefile.inc.am
index 8ef9ee1dfa..c5c50f1844 100644
--- a/src/util/Makefile.inc.am
+++ b/src/util/Makefile.inc.am
@@ -278,6 +278,7 @@ libvirt_util_la_LIBADD = \
 	$(NUMACTL_LIBS) \
 	$(ACL_LIBS) \
 	$(GNUTLS_LIBS) \
+	$(DLOPEN_LIBS) \
 	$(NULL)
 
 
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 26c887649e..3e129c04c4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -528,7 +528,7 @@ nss_libnss_libvirt_impl_la_CFLAGS = \
 nss_libnss_libvirt_impl_la_LIBADD = \
 	../gnulib/lib/libgnu.la \
 	../src/libvirt-nss.la \
-	$(DLOPEN_LIBS)
+	$(NULL)
 
 nss_libnss_libvirt_la_SOURCES =
 nss_libnss_libvirt_la_LDFLAGS = \
@@ -556,7 +556,7 @@ nss_libnss_libvirt_guest_impl_la_CFLAGS = \
 nss_libnss_libvirt_guest_impl_la_LIBADD = \
 	../gnulib/lib/libgnu.la \
 	../src/libvirt-nss.la \
-	$(DLOPEN_LIBS)
+	$(NULL)
 
 nss_libnss_libvirt_guest_la_SOURCES =
 nss_libnss_libvirt_guest_la_LDFLAGS = \
-- 
2.16.4




More information about the libvir-list mailing list