meson: tools: build libnss_libvirt_guest_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 d6a0ccdab2c5a70882e0e414e6fadef5dc8b4b6d..b1388280fef8481bef0da2ffceca2ee1db69356a 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -19,10 +19,6 @@
 # dir or public API dir. Specific files can
 # still be included via their path relative to the root if
 # needed
-STANDALONE_CPPFLAGS = -I$(top_srcdir)
-
-noinst_LTLIBRARIES =
-
 if WITH_WIRESHARK_DISSECTOR
 
 ws_plugin_LTLIBRARIES = wireshark/src/libvirt.la
@@ -71,25 +67,6 @@ nss_libnss_libvirt_la_DEPENDENCIES = \
        $(nss_libnss_libvirt_la_LIBADD) \
        $(LIBVIRT_NSS_SYMBOL_FILE)
 
-noinst_LTLIBRARIES += nss/libnss_libvirt_guest_impl.la
-nss_libnss_libvirt_guest_impl_la_SOURCES = \
-       $(LIBVIRT_NSS_SOURCES) \
-       nss/libvirt_nss_macs.h \
-       nss/libvirt_nss_macs.c \
-       $(NULL)
-
-nss_libnss_libvirt_guest_impl_la_CPPFLAGS = $(STANDALONE_CPPFLAGS)
-nss_libnss_libvirt_guest_impl_la_CFLAGS = \
-       -DLIBVIRT_NSS \
-       -DLIBVIRT_NSS_GUEST \
-       $(YAJL_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-nss_libnss_libvirt_guest_impl_la_LIBADD = \
-       $(YAJL_LIBS) \
-       $(NULL)
-
 nss_libnss_libvirt_guest_la_SOURCES =
 nss_libnss_libvirt_guest_la_LDFLAGS = \
        $(VERSION_SCRIPT_FLAGS)$(LIBVIRT_GUEST_NSS_SYMBOL_FILE) \

diff --git a/tools/nss/meson.build b/tools/nss/meson.build
index 9bccdafd19bd4264272605442f4b3851bd74844a..ef75ffe001082c8b89bd07b80d9927b4f00c0728 100644 (file)
--- a/tools/nss/meson.build
+++ b/tools/nss/meson.build
@@ -15,6 +15,10 @@ nss_sources = [
   'libvirt_nss_leases.c',
 ]
 
+nss_guest_sources = [
+  'libvirt_nss_macs.c',
+]
+
 nss_libvirt_impl = static_library(
   'nss_libvirt_impl',
   [
@@ -28,3 +32,19 @@ nss_libvirt_impl = static_library(
     yajl_dep,
   ],
 )
+
+nss_libvirt_guest_impl = static_library(
+  'nss_libvirt_guest_impl',
+  [
+    nss_sources,
+    nss_guest_sources,
+  ],
+  c_args: [
+    '-DLIBVIRT_NSS',
+    '-DLIBVIRT_NSS_GUEST',
+  ],
+  dependencies: [
+    tools_dep,
+    yajl_dep,
+  ],
+)