[libvirt PATCH 142/351] meson: src: build libvirt_test.a static library
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/Makefile.am | 1 -
src/meson.build | 1 +
src/test/Makefile.inc.am | 23 -----------------------
src/test/meson.build | 24 ++++++++++++++++++++++++
4 files changed, 25 insertions(+), 24 deletions(-)
delete mode 100644 src/test/Makefile.inc.am
create mode 100644 src/test/meson.build
diff --git a/src/Makefile.am b/src/Makefile.am
index b7fd239d0fb..555c677c615 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -75,7 +75,6 @@ include access/Makefile.inc.am
include logging/Makefile.inc.am
include locking/Makefile.inc.am
include admin/Makefile.inc.am
-include test/Makefile.inc.am
include esx/Makefile.inc.am
include vmx/Makefile.inc.am
include vmware/Makefile.inc.am
diff --git a/src/meson.build b/src/meson.build
index 61be43904e8..af9dcfbb5f5 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -91,4 +91,5 @@ subdir('admin')
subdir('esx')
subdir('hyperv')
subdir('openvz')
+subdir('test')
subdir('vmware')
diff --git a/src/test/Makefile.inc.am b/src/test/Makefile.inc.am
deleted file mode 100644
index c209414745e..00000000000
--- a/src/test/Makefile.inc.am
+++ /dev/null
@@ -1,23 +0,0 @@
-# vim: filetype=automake
-
-TEST_DRIVER_SOURCES = \
- test/test_driver.c \
- test/test_driver.h \
- $(NULL)
-TEST_DRIVER_ASSETS = test/test-screenshot.png
-
-DRIVER_SOURCE_FILES += $(addprefix $(srcdir)/,$(TEST_DRIVER_SOURCES))
-
-if WITH_TEST
-
-driver_test_asset_DATA = $(TEST_DRIVER_ASSETS)
-driver_test_assetdir = $(pkgdatadir)
-
-noinst_LTLIBRARIES += libvirt_driver_test.la
-libvirt_la_BUILT_LIBADD += libvirt_driver_test.la
-libvirt_driver_test_la_CFLAGS = \
- -I$(srcdir)/conf \
- $(AM_CFLAGS) \
- $(NULL)
-libvirt_driver_test_la_SOURCES = $(TEST_DRIVER_SOURCES)
-endif WITH_TEST
diff --git a/src/test/meson.build b/src/test/meson.build
new file mode 100644
index 00000000000..ec7b12304ec
--- /dev/null
+++ b/src/test/meson.build
@@ -0,0 +1,24 @@
+test_driver_sources = [
+ 'test_driver.c',
+]
+
+test_driver_assets = [
+ 'test-screenshot.png',
+]
+
+if conf.has('WITH_TEST')
+ test_lib = static_library(
+ 'virt_test',
+ [
+ test_driver_sources,
+ ],
+ dependencies: [
+ src_dep,
+ ],
+ include_directories: [
+ conf_inc_dir,
+ ],
+ )
+
+ install_data(test_driver_assets, install_dir: pkgdatadir)
+endif
--
2.26.2