Signed-off-by: Pavel Hrdina <phrd...@redhat.com>
---
tools/Makefile.am | 22 ----------------------
tools/nss/meson.build | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 22 deletions(-)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3d9d042d2f3..d6a0ccdab2c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -53,29 +53,7 @@ wireshark/src/libvirt/protocol.h:
wireshark/util/genxdrstub.pl \
endif WITH_WIRESHARK_DISSECTOR
-LIBVIRT_NSS_SOURCES = \
- nss/libvirt_nss.c \
- nss/libvirt_nss.h \
- nss/libvirt_nss_leases.c \
- nss/libvirt_nss_leases.h \
- $(NULL)
-
if WITH_NSS
-noinst_LTLIBRARIES += nss/libnss_libvirt_impl.la
-nss_libnss_libvirt_impl_la_SOURCES = \
- $(LIBVIRT_NSS_SOURCES)
-
-nss_libnss_libvirt_impl_la_CPPFLAGS = $(STANDALONE_CPPFLAGS)
-nss_libnss_libvirt_impl_la_CFLAGS = \
- -DLIBVIRT_NSS \
- $(YAJL_CFLAGS) \
- $(AM_CFLAGS) \
- $(NULL)
-
-nss_libnss_libvirt_impl_la_LIBADD = \
- $(YAJL_LIBS) \
- $(NULL)
-
nss_libnss_libvirt_la_SOURCES =
nss_libnss_libvirt_la_LDFLAGS = \
$(VERSION_SCRIPT_FLAGS)$(LIBVIRT_NSS_SYMBOL_FILE) \
diff --git a/tools/nss/meson.build b/tools/nss/meson.build
index b83a63c9c34..9bccdafd19b 100644
--- a/tools/nss/meson.build
+++ b/tools/nss/meson.build
@@ -9,3 +9,22 @@ else
nss_so_ver = '2'
nss_prefix = 'lib'
endif
+
+nss_sources = [
+ 'libvirt_nss.c',
+ 'libvirt_nss_leases.c',
+]
+
+nss_libvirt_impl = static_library(
+ 'nss_libvirt_impl',
+ [
+ nss_sources,
+ ],
+ c_args: [
+ '-DLIBVIRT_NSS'
+ ],
+ dependencies: [
+ tools_dep,
+ yajl_dep,
+ ],
+)
--
2.26.2
