meson: src: build libvirt_storage_driver_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 325a6227b7d27a12f4e859578dc72006877c1e54..4388ac0ab2094b108a7534f95414446a10ccc900 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -156,6 +156,7 @@ subdir('network')
 subdir('node_device')
 subdir('nwfilter')
 subdir('security')
+subdir('storage')
 
 subdir('bhyve')
 subdir('esx')

diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am
index e201b9938d9b6d32bada07ff01b82ccbeb10707c..87ba8c0bd1699c8a52cc7912ed188b4434f65ef3 100644 (file)
--- a/src/storage/Makefile.inc.am
+++ b/src/storage/Makefile.inc.am
@@ -1,18 +1,5 @@
 # vim: filetype=automake
 
-STORAGE_DRIVER_BACKEND_SOURCES = \
-       storage/storage_backend.h \
-       storage/storage_backend.c \
-       $(NULL)
-
-STORAGE_DRIVER_SOURCES = \
-       storage/storage_driver.h \
-       storage/storage_driver.c \
-       $(STORAGE_DRIVER_BACKEND_SOURCES) \
-       storage/storage_util.h \
-       storage/storage_util.c \
-       $(NULL)
-
 STORAGE_DRIVER_FS_SOURCES = \
        storage/storage_backend_fs.h \
        storage/storage_backend_fs.c \
@@ -98,23 +85,7 @@ storagebackend_LTLIBRARIES =
 storagefiledir = $(libdir)/libvirt/storage-file
 storagefile_LTLIBRARIES =
 
-# Needed to keep automake quiet about conditionals
-libvirt_driver_storage_impl_la_SOURCES =
-libvirt_driver_storage_impl_la_CFLAGS = \
-       -I$(srcdir)/access \
-       -I$(builddir)/access \
-       -I$(srcdir)/conf \
-       $(AM_CFLAGS) \
-       $(NULL)
-libvirt_driver_storage_impl_la_LDFLAGS = $(AM_LDFLAGS)
-libvirt_driver_storage_impl_la_LIBADD = $(SECDRIVER_LIBS) $(LIBXML_LIBS)
-if WITH_BLKID
-libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS)
-libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS)
-endif WITH_BLKID
-
 if WITH_STORAGE
-noinst_LTLIBRARIES += libvirt_driver_storage_impl.la
 libvirt_driver_storage_la_SOURCES =
 libvirt_driver_storage_la_LIBADD = \
        libvirt_driver_storage_impl.la \
@@ -123,7 +94,6 @@ libvirt_driver_storage_la_LIBADD = \
        $(NULL)
 mod_LTLIBRARIES += libvirt_driver_storage.la
 libvirt_driver_storage_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SOURCES)
 
 sbin_PROGRAMS += virtstoraged
 

diff --git a/src/storage/meson.build b/src/storage/meson.build
new file mode 100644 (file)
index 0000000..36ef45b
--- /dev/null
+++ b/src/storage/meson.build
@@ -0,0 +1,27 @@
+storage_driver_backend_sources = [
+  'storage_backend.c',
+]
+
+storage_driver_sources = [
+  'storage_driver.c',
+  'storage_util.c',
+  storage_driver_backend_sources,
+]
+
+if conf.has('WITH_STORAGE')
+  storage_driver_impl_lib = static_library(
+    'virt_storage_driver_impl',
+    [
+      storage_driver_sources,
+    ],
+    dependencies: [
+      access_dep,
+      blkid_dep,
+      secdriver_dep,
+      src_dep,
+    ],
+    include_directories: [
+      conf_inc_dir,
+    ],
+  )
+endif