meson: tools: build libnss_libvirt_impl.a static library

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3d9d042d2f3cae3e6399cdaf476cca6062c2d825..d6a0ccdab2c5a70882e0e414e6fadef5dc8b4b6d 100644 (file)
--- 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 b83a63c9c345f18e30ff7813506ffaeb61ead2a7..9bccdafd19bd4264272605442f4b3851bd74844a 100644 (file)
--- 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,
+  ],
+)