meson: src: build libvirt_driver_network_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/src/meson.build b/src/meson.build
index f7a00f1e953ea5c314f68a14963f0a5819e10436..f6b342098d1e248ac1f8ce37d953c8f41940b3d3 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -152,6 +152,7 @@ subdir('remote')
 subdir('admin')
 subdir('locking')
 subdir('logging')
+subdir('network')
 subdir('security')
 
 subdir('bhyve')

diff --git a/src/network/Makefile.inc.am b/src/network/Makefile.inc.am
index 5a5d1630a087fd1656067ea27fe1943f42cfdacb..c93b2e693d04adfb9d4fe5dc998bc26e4f8a9271 100644 (file)
--- a/src/network/Makefile.inc.am
+++ b/src/network/Makefile.inc.am
@@ -1,17 +1,5 @@
 # vim: filetype=automake
 
-NETWORK_DRIVER_SOURCES = \
-       network/bridge_driver.h \
-       network/bridge_driver.c \
-       network/bridge_driver_platform.h \
-       network/bridge_driver_platform.c \
-       $(NULL)
-
-NETWORK_DRIVER_PLATFORM_INC = \
-       network/bridge_driver_linux.c \
-       network/bridge_driver_nop.c \
-       $(NULL)
-
 NETWORK_LEASES_HELPER_SOURCES = \
        network/leaseshelper.c \
        $(NULL)
@@ -35,17 +23,6 @@ libvirt_driver_network_la_LIBADD = \
 mod_LTLIBRARIES += libvirt_driver_network.la
 libvirt_driver_network_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
 
-libvirt_driver_network_impl_la_CFLAGS = \
-       $(LIBNL_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       -I$(srcdir)/access \
-       -I$(builddir)/access \
-       -I$(srcdir)/conf \
-       $(AM_CFLAGS) \
-       $(NULL)
-libvirt_driver_network_impl_la_SOURCES = $(NETWORK_DRIVER_SOURCES)
-libvirt_driver_network_impl_la_LIBADD  = $(DBUS_LIBS) $(LIBXML_LIBS)
-
 sbin_PROGRAMS += virtnetworkd
 
 nodist_conf_DATA += network/virtnetworkd.conf

diff --git a/src/network/meson.build b/src/network/meson.build
new file mode 100644 (file)
index 0000000..2b05544
--- /dev/null
+++ b/src/network/meson.build
@@ -0,0 +1,22 @@
+network_driver_sources = [
+  'bridge_driver.c',
+  'bridge_driver_platform.c',
+]
+
+if conf.has('WITH_NETWORK')
+  network_driver_impl = static_library(
+    'virt_driver_network_impl',
+    [
+      network_driver_sources,
+    ],
+    dependencies: [
+      access_dep,
+      dbus_dep,
+      libnl_dep,
+      src_dep,
+    ],
+    include_directories: [
+      conf_inc_dir,
+    ],
+  )
+endif