diff options
| author |   Eric Blake <eblake@redhat.com> | 2012-08-21 06:50:28 -0600 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2012-08-21 09:44:14 -0600 |
| commit | 1a4379cb21e8b9060a29406c4d7af4615980e760 (patch) | |
| tree | 7df4df2d7162cced5e69f567802cfbba1ad13d03 /src/Makefile.am | |
| parent | build: silence stupid gcc warning on STREQ_NULLABLE (diff) | |
| download | libvirt-1a4379cb21e8b9060a29406c4d7af4615980e760.tar.gz libvirt-1a4379cb21e8b9060a29406c4d7af4615980e760.tar.bz2 libvirt-1a4379cb21e8b9060a29406c4d7af4615980e760.zip | |
build: split driver_storage into convenience library
Commit 1d22ba95 was complete at the time, but we have since
reintroduced a warning that is fixed in the same manner:
CCLD storagebackendsheepdogtest
*** Warning: Linking the executable storagebackendsheepdogtest against the loadable module
*** libvirt_driver_storage.so is not portable!
* src/Makefile.am (libvirt_driver_storage.la): Factor into new
convenience library libvirt_driver_storage_impl.la.
* tests/Makefile.am (storagebackendsheepdogtest_LDADD): Link to
convenience library, not shared library.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e90be304f..152ee5b7a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1050,66 +1050,67 @@ libvirt_driver_secret_la_SOURCES = $(SECRET_DRIVER_SOURCES) endif # Needed to keep automake quiet about conditionals -libvirt_driver_storage_la_SOURCES = -libvirt_driver_storage_la_CFLAGS = \ +libvirt_driver_storage_impl_la_SOURCES = +libvirt_driver_storage_impl_la_CFLAGS = \ -I$(top_srcdir)/src/conf $(AM_CFLAGS) -libvirt_driver_storage_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_storage_la_LIBADD = +libvirt_driver_storage_impl_la_LDFLAGS = $(AM_LDFLAGS) +libvirt_driver_storage_impl_la_LIBADD = if WITH_SECDRIVER_SELINUX -libvirt_driver_storage_la_LIBADD += $(SELINUX_LIBS) +libvirt_driver_storage_impl_la_LIBADD += $(SELINUX_LIBS) endif if WITH_SECDRIVER_APPARMOR -libvirt_driver_storage_la_LIBADD += $(APPARMOR_LIBS) +libvirt_driver_storage_impl_la_LIBADD += $(APPARMOR_LIBS) endif if HAVE_LIBBLKID -libvirt_driver_storage_la_CFLAGS += $(BLKID_CFLAGS) -libvirt_driver_storage_la_LIBADD += $(BLKID_LIBS) +libvirt_driver_storage_impl_la_CFLAGS += $(BLKID_CFLAGS) +libvirt_driver_storage_impl_la_LIBADD += $(BLKID_LIBS) endif 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 if WITH_DRIVER_MODULES mod_LTLIBRARIES += libvirt_driver_storage.la +libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la +libvirt_driver_storage_la_LDFOAGS = -module -avoid-version else noinst_LTLIBRARIES += libvirt_driver_storage.la # Stateful, so linked to daemon instead #libvirt_la_BUILT_LIBADD += libvirt_driver_storage.la endif -if WITH_DRIVER_MODULES -libvirt_driver_storage_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_storage_la_LDFLAGS += -module -avoid-version -endif -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SOURCES) -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_FS_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_FS_SOURCES) endif if WITH_STORAGE_LVM -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_LVM_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_LVM_SOURCES) endif if WITH_STORAGE_ISCSI -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_ISCSI_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_ISCSI_SOURCES) endif if WITH_STORAGE_SCSI -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SCSI_SOURCES) endif if WITH_STORAGE_MPATH -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES) -libvirt_driver_storage_la_CFLAGS += $(DEVMAPPER_CFLAGS) -libvirt_driver_storage_la_LIBADD += $(DEVMAPPER_LIBS) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_MPATH_SOURCES) +libvirt_driver_storage_impl_la_CFLAGS += $(DEVMAPPER_CFLAGS) +libvirt_driver_storage_impl_la_LIBADD += $(DEVMAPPER_LIBS) endif if WITH_STORAGE_DISK -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_DISK_SOURCES) endif if WITH_STORAGE_RBD -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_RBD_SOURCES) -libvirt_driver_storage_la_LIBADD += $(LIBRBD_LIBS) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_RBD_SOURCES) +libvirt_driver_storage_impl_la_LIBADD += $(LIBRBD_LIBS) endif if WITH_STORAGE_SHEEPDOG -libvirt_driver_storage_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES) +libvirt_driver_storage_impl_la_SOURCES += $(STORAGE_DRIVER_SHEEPDOG_SOURCES) endif if WITH_NODE_DEVICES |