From: Jonathon Jongsma <jjongsma@redhat.com>
Date: Thu, 18 Jun 2020 21:06:00 +0000 (-0500)
Subject: nodedev: Build a non-loadable driver lib
X-Git-Tag: v6.5.0-rc1~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c44bffb9af98749dfbd31e69b279bdb035ebb037;p=thirdparty%2Flibvirt.git

nodedev: Build a non-loadable driver lib

In order to test the nodedev driver, we need to link against a
non-loadable module. Similar to other loadable modules already in the
repository, create an _impl library that can be linked against the unit
tests and then create a loadable module from that.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/node_device/Makefile.inc.am b/src/node_device/Makefile.inc.am
index 788563665f..5993165b56 100644
--- a/src/node_device/Makefile.inc.am
+++ b/src/node_device/Makefile.inc.am
@@ -34,34 +34,37 @@ EXTRA_DIST += \
 
 if WITH_NODE_DEVICES
 # Needed to keep automake quiet about conditionals
+noinst_LTLIBRARIES += libvirt_driver_nodedev_impl.la
+libvirt_driver_nodedev_la_SOURCES =
+libvirt_driver_nodedev_la_LIBADD = libvirt_driver_nodedev_impl.la
 mod_LTLIBRARIES += libvirt_driver_nodedev.la
-libvirt_driver_nodedev_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)
+libvirt_driver_nodedev_impl_la_SOURCES = $(NODE_DEVICE_DRIVER_SOURCES)
 
-libvirt_driver_nodedev_la_CFLAGS = \
+libvirt_driver_nodedev_impl_la_CFLAGS = \
 	-I$(srcdir)/access \
 	-I$(builddir)/access \
 	-I$(srcdir)/conf \
 	$(AM_CFLAGS) \
 	$(LIBNL_CFLAGS) \
 	$(NULL)
-libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
-libvirt_driver_nodedev_la_LIBADD = \
+libvirt_driver_nodedev_impl_la_LDFLAGS = $(AM_LDFLAGS_MOD_NOUNDEF)
+libvirt_driver_nodedev_impl_la_LIBADD = \
 	libvirt.la \
 	$(GLIB_LIBS) \
 	$(NULL)
 
 if WITH_HAL
-libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES)
-libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS)
-libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS)
+libvirt_driver_nodedev_impl_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES)
+libvirt_driver_nodedev_impl_la_CFLAGS += $(HAL_CFLAGS)
+libvirt_driver_nodedev_impl_la_LIBADD += $(HAL_LIBS)
 endif WITH_HAL
 if WITH_UDEV
-libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES)
-libvirt_driver_nodedev_la_CFLAGS += \
+libvirt_driver_nodedev_impl_la_SOURCES += $(NODE_DEVICE_DRIVER_UDEV_SOURCES)
+libvirt_driver_nodedev_impl_la_CFLAGS += \
 	$(UDEV_CFLAGS) \
 	$(PCIACCESS_CFLAGS) \
 	$(NULL)
-libvirt_driver_nodedev_la_LIBADD += \
+libvirt_driver_nodedev_impl_la_LIBADD += \
 	$(UDEV_LIBS) \
 	$(PCIACCESS_LIBS) \
 	$(NULL)