Signed-off-by: Pavel Hrdina <phrd...@redhat.com> --- src/meson.build | 1 + src/network/Makefile.inc.am | 23 ----------------------- src/network/meson.build | 22 ++++++++++++++++++++++ 3 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 src/network/meson.build
diff --git a/src/meson.build b/src/meson.build index 217ceb2d6ef..aab85399948 100644 --- a/src/meson.build +++ b/src/meson.build @@ -143,6 +143,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 5a5d1630a08..c93b2e693d0 100644 --- 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 index 00000000000..2b05544fd22 --- /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 -- 2.26.2