From nobody Wed May 14 18:20:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1519812892235417.9574437067042; Wed, 28 Feb 2018 02:14:52 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BF691883B0; Wed, 28 Feb 2018 10:14:50 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 94F441801B; Wed, 28 Feb 2018 10:14:50 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 525944A472; Wed, 28 Feb 2018 10:14:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1SAEhIn005607 for ; Wed, 28 Feb 2018 05:14:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id C9E162026E0E; Wed, 28 Feb 2018 10:14:43 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.95]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A0AE2026E04; Wed, 28 Feb 2018 10:14:43 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 28 Feb 2018 10:14:24 +0000 Message-Id: <20180228101435.464-7-berrange@redhat.com> In-Reply-To: <20180228101435.464-1-berrange@redhat.com> References: <20180228101435.464-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 06/17] make: split storage driver build rules into storage/Makefile.inc.am X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 28 Feb 2018 10:14:51 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 259 +---------------------------------- src/storage/Makefile.inc.am | 323 ++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 324 insertions(+), 258 deletions(-) create mode 100644 src/storage/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 6518464639..8d0780d25e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -103,6 +103,7 @@ include network/Makefile.inc.am include nwfilter/Makefile.inc.am include node_device/Makefile.inc.am include secret/Makefile.inc.am +include storage/Makefile.inc.am =20 =20 THREAD_LIBS =3D $(LIB_PTHREAD) $(LTLIBMULTITHREAD) @@ -784,14 +785,8 @@ EXTRA_DIST +=3D check-drivername.pl =20 DRIVER_SOURCE_FILES +=3D \ $(REMOTE_DRIVER_SOURCES) \ - $(STORAGE_DRIVER_SOURCES) \ $(NULL) =20 -STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(STORAGE_DRIVER_SOURCES) \ - $(NULL) - - check-driverimpls: $(AM_V_GEN)$(PERL) $(srcdir)/check-driverimpls.pl \ $(filter /%,$(DRIVER_SOURCE_FILES)) \ @@ -822,53 +817,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ security/virt-aa-helper.c =20 =20 -# Storage backend specific impls -STORAGE_DRIVER_BACKEND_SOURCES =3D \ - storage/storage_backend.h storage/storage_backend.c - -STORAGE_DRIVER_SOURCES =3D \ - storage/storage_driver.h storage/storage_driver.c \ - $(STORAGE_DRIVER_BACKEND_SOURCES) \ - storage/storage_util.h storage/storage_util.c - -STORAGE_DRIVER_FS_SOURCES =3D \ - storage/storage_backend_fs.h storage/storage_backend_fs.c - -STORAGE_DRIVER_LVM_SOURCES =3D \ - storage/storage_backend_logical.h \ - storage/storage_backend_logical.c - -STORAGE_DRIVER_ISCSI_SOURCES =3D \ - storage/storage_backend_iscsi.h storage/storage_backend_iscsi.c - -STORAGE_DRIVER_SCSI_SOURCES =3D \ - storage/storage_backend_scsi.h storage/storage_backend_scsi.c - -STORAGE_DRIVER_MPATH_SOURCES =3D \ - storage/storage_backend_mpath.h storage/storage_backend_mpath.c - -STORAGE_DRIVER_DISK_SOURCES =3D \ - storage/storage_backend_disk.h storage/storage_backend_disk.c - -STORAGE_DRIVER_RBD_SOURCES =3D \ - storage/storage_backend_rbd.h storage/storage_backend_rbd.c - -STORAGE_DRIVER_SHEEPDOG_SOURCES =3D \ - storage/storage_backend_sheepdog.h storage/storage_backend_sheepdog.c \ - storage/storage_backend_sheepdog_priv.h - -STORAGE_DRIVER_GLUSTER_SOURCES =3D \ - storage/storage_backend_gluster.h storage/storage_backend_gluster.c - -STORAGE_DRIVER_ZFS_SOURCES =3D \ - storage/storage_backend_zfs.h storage/storage_backend_zfs.c - -STORAGE_DRIVER_VSTORAGE_SOURCES =3D \ - storage/storage_backend_vstorage.h \ - storage/storage_backend_vstorage.c - -STORAGE_HELPER_DISK_SOURCES =3D \ - storage/parthelper.c =20 UTIL_IO_HELPER_SOURCES =3D \ util/iohelper.c @@ -1113,173 +1061,6 @@ EXTRA_DIST +=3D \ =20 =20 =20 -# Needed to keep automake quiet about conditionals -libvirt_driver_storage_impl_la_SOURCES =3D -libvirt_driver_storage_impl_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/secret \ - $(AM_CFLAGS) -libvirt_driver_storage_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_storage_impl_la_LIBADD =3D -libvirt_driver_storage_impl_la_LIBADD +=3D $(SECDRIVER_LIBS) $(LIBXML_LIBS) -if WITH_BLKID -libvirt_driver_storage_impl_la_CFLAGS +=3D $(BLKID_CFLAGS) -libvirt_driver_storage_impl_la_LIBADD +=3D $(BLKID_LIBS) -endif WITH_BLKID - -storagebackenddir =3D $(libdir)/libvirt/storage-backend -storagebackend_LTLIBRARIES =3D - -if WITH_STORAGE -noinst_LTLIBRARIES +=3D libvirt_driver_storage_impl.la -libvirt_driver_storage_la_SOURCES =3D -libvirt_driver_storage_la_LIBADD =3D libvirt_driver_storage_impl.la -mod_LTLIBRARIES +=3D libvirt_driver_storage.la -libvirt_driver_storage_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_storage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_storage_impl_la_SOURCES +=3D $(STORAGE_DRIVER_SOURCES) - - -libvirt_storage_backend_fs_la_SOURCES =3D $(STORAGE_DRIVER_FS_SOURCES) -libvirt_storage_backend_fs_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_fs.la -libvirt_storage_backend_fs_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_fs_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu.la -endif WITH_STORAGE - -if WITH_STORAGE_LVM -libvirt_storage_backend_logical_la_SOURCES =3D \ - $(STORAGE_DRIVER_LVM_SOURCES) -libvirt_storage_backend_logical_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_logical.la -libvirt_storage_backend_logical_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_logical_la_LIBADD =3D libvirt.la ../gnulib/lib/lib= gnu.la -endif WITH_STORAGE_LVM - -if WITH_STORAGE_ISCSI -libvirt_storage_backend_iscsi_la_SOURCES =3D \ - $(STORAGE_DRIVER_ISCSI_SOURCES) -libvirt_storage_backend_iscsi_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(srcdir)/secret \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_iscsi.la -libvirt_storage_backend_iscsi_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_iscsi_la_LIBADD =3D libvirt.la ../gnulib/lib/libgn= u.la -endif WITH_STORAGE_ISCSI - -if WITH_STORAGE_SCSI -libvirt_storage_backend_scsi_la_SOURCES =3D $(STORAGE_DRIVER_SCSI_SOURCES) -libvirt_storage_backend_scsi_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_scsi.la -libvirt_storage_backend_scsi_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_scsi_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu= .la -endif WITH_STORAGE_SCSI - -if WITH_STORAGE_MPATH -libvirt_storage_backend_mpath_la_SOURCES =3D \ - $(STORAGE_DRIVER_MPATH_SOURCES) -libvirt_storage_backend_mpath_la_LIBADD =3D $(DEVMAPPER_LIBS) -libvirt_storage_backend_mpath_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(DEVMAPPER_CFLAGS) \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_mpath.la -libvirt_storage_backend_mpath_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_mpath_la_LIBADD +=3D libvirt.la ../gnulib/lib/libg= nu.la -endif WITH_STORAGE_MPATH - -if WITH_STORAGE_DISK -libvirt_storage_backend_disk_la_SOURCES =3D $(STORAGE_DRIVER_DISK_SOURCES) -libvirt_storage_backend_disk_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_disk.la -libvirt_storage_backend_disk_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_disk_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu= .la -endif WITH_STORAGE_DISK - -if WITH_STORAGE_RBD -libvirt_storage_backend_rbd_la_SOURCES =3D $(STORAGE_DRIVER_RBD_SOURCES) -libvirt_storage_backend_rbd_la_LIBADD =3D $(LIBRBD_LIBS) -libvirt_storage_backend_rbd_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(srcdir)/secret \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_rbd.la -libvirt_storage_backend_rbd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_rbd_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu= .la -endif WITH_STORAGE_RBD - -if WITH_STORAGE_SHEEPDOG -libvirt_storage_backend_sheepdog_la_SOURCES =3D \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) -libvirt_storage_backend_sheepdog_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -libvirt_storage_backend_sheepdog_priv_la_SOURCES =3D \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) -libvirt_storage_backend_sheepdog_priv_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -noinst_LTLIBRARIES +=3D libvirt_storage_backend_sheepdog_priv.la - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_sheepdog.la -libvirt_storage_backend_sheepdog_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_sheepdog_la_LIBADD =3D libvirt.la ../gnulib/lib/li= bgnu.la -endif WITH_STORAGE_SHEEPDOG - -if WITH_STORAGE_GLUSTER -libvirt_storage_backend_gluster_la_SOURCES =3D \ - $(STORAGE_DRIVER_GLUSTER_SOURCES) -libvirt_storage_backend_gluster_la_LIBADD =3D $(GLUSTERFS_LIBS) -libvirt_storage_backend_gluster_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(GLUSTERFS_CFLAGS) \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_gluster.la -libvirt_storage_backend_gluster_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_gluster_la_LIBADD +=3D libvirt.la ../gnulib/lib/li= bgnu.la -endif WITH_STORAGE_GLUSTER - -if WITH_STORAGE_ZFS -libvirt_storage_backend_zfs_la_SOURCES =3D $(STORAGE_DRIVER_ZFS_SOURCES) -libvirt_storage_backend_zfs_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_zfs.la -libvirt_storage_backend_zfs_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_zfs_la_LIBADD =3D libvirt.la ../gnulib/lib/libgnu.= la -endif WITH_STORAGE_ZFS - -if WITH_STORAGE_VSTORAGE -libvirt_storage_backend_vstorage_la_SOURCES =3D \ - $(STORAGE_DRIVER_VSTORAGE_SOURCES) -libvirt_storage_backend_vstorage_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) - -storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_vstorage.la -libvirt_storage_backend_vstorage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) -libvirt_storage_backend_vstorage_la_LIBADD =3D libvirt.la ../gnulib/lib/li= bgnu.la -endif WITH_STORAGE_VSTORAGE =20 =20 =20 @@ -1394,18 +1175,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendisp= atch.pl \ # Add all conditional sources just in case... EXTRA_DIST +=3D \ $(REMOTE_DRIVER_SOURCES) \ - $(STORAGE_DRIVER_SOURCES) \ - $(STORAGE_DRIVER_FS_SOURCES) \ - $(STORAGE_DRIVER_LVM_SOURCES) \ - $(STORAGE_DRIVER_ISCSI_SOURCES) \ - $(STORAGE_DRIVER_SCSI_SOURCES) \ - $(STORAGE_DRIVER_MPATH_SOURCES) \ - $(STORAGE_DRIVER_DISK_SOURCES) \ - $(STORAGE_DRIVER_RBD_SOURCES) \ - $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ - $(STORAGE_DRIVER_GLUSTER_SOURCES) \ - $(STORAGE_DRIVER_ZFS_SOURCES) \ - $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ $(SECURITY_DRIVER_SELINUX_SOURCES) \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) @@ -2512,32 +2281,6 @@ libvirt_iohelper_CFLAGS =3D \ =20 endif WITH_LIBVIRTD =20 -if WITH_STORAGE_DISK -if WITH_LIBVIRTD -libexec_PROGRAMS +=3D libvirt_parthelper - -libvirt_parthelper_SOURCES =3D $(STORAGE_HELPER_DISK_SOURCES) -libvirt_parthelper_LDFLAGS =3D \ - $(AM_LDFLAGS) \ - $(PIE_LDFLAGS) \ - $(NULL) -libvirt_parthelper_LDADD =3D \ - $(LIBPARTED_LIBS) \ - libvirt_util.la \ - ../gnulib/lib/libgnu.la -if WITH_DTRACE_PROBES -libvirt_parthelper_LDADD +=3D libvirt_probes.lo -endif WITH_DTRACE_PROBES - -libvirt_parthelper_CFLAGS =3D \ - $(LIBPARTED_CFLAGS) \ - $(AM_CFLAGS) \ - $(PIE_CFLAGS) \ - $(NULL) -endif WITH_LIBVIRTD -endif WITH_STORAGE_DISK -EXTRA_DIST +=3D $(STORAGE_HELPER_DISK_SOURCES) - =20 if WITH_SANLOCK libexec_PROGRAMS +=3D libvirt_sanlock_helper diff --git a/src/storage/Makefile.inc.am b/src/storage/Makefile.inc.am new file mode 100644 index 0000000000..7ca7230cc8 --- /dev/null +++ b/src/storage/Makefile.inc.am @@ -0,0 +1,323 @@ +STORAGE_DRIVER_BACKEND_SOURCES =3D \ + storage/storage_backend.h \ + storage/storage_backend.c \ + $(NULL) + +STORAGE_DRIVER_SOURCES =3D \ + 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 =3D \ + storage/storage_backend_fs.h \ + storage/storage_backend_fs.c \ + $(NULL) + +STORAGE_DRIVER_LVM_SOURCES =3D \ + storage/storage_backend_logical.h \ + storage/storage_backend_logical.c \ + $(NULL) + +STORAGE_DRIVER_ISCSI_SOURCES =3D \ + storage/storage_backend_iscsi.h \ + storage/storage_backend_iscsi.c \ + $(NULL) + +STORAGE_DRIVER_SCSI_SOURCES =3D \ + storage/storage_backend_scsi.h \ + storage/storage_backend_scsi.c \ + $(NULL) + +STORAGE_DRIVER_MPATH_SOURCES =3D \ + storage/storage_backend_mpath.h \ + storage/storage_backend_mpath.c \ + $(NULL) + +STORAGE_DRIVER_DISK_SOURCES =3D \ + storage/storage_backend_disk.h \ + storage/storage_backend_disk.c \ + $(NULL) + +STORAGE_DRIVER_RBD_SOURCES =3D \ + storage/storage_backend_rbd.h \ + storage/storage_backend_rbd.c \ + $(NULL) + +STORAGE_DRIVER_SHEEPDOG_SOURCES =3D \ + storage/storage_backend_sheepdog.h \ + storage/storage_backend_sheepdog.c \ + storage/storage_backend_sheepdog_priv.h \ + $(NULL) + +STORAGE_DRIVER_GLUSTER_SOURCES =3D \ + storage/storage_backend_gluster.h \ + storage/storage_backend_gluster.c \ + $(NULL) + +STORAGE_DRIVER_ZFS_SOURCES =3D \ + storage/storage_backend_zfs.h \ + storage/storage_backend_zfs.c \ + $(NULL) + +STORAGE_DRIVER_VSTORAGE_SOURCES =3D \ + storage/storage_backend_vstorage.h \ + storage/storage_backend_vstorage.c \ + $(NULL) + +STORAGE_HELPER_DISK_SOURCES =3D \ + storage/parthelper.c \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D $(STORAGE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D $(STORAGE_DRIVER_SOURCES) +EXTRA_DIST +=3D \ + $(STORAGE_DRIVER_SOURCES) \ + $(STORAGE_DRIVER_FS_SOURCES) \ + $(STORAGE_DRIVER_LVM_SOURCES) \ + $(STORAGE_DRIVER_ISCSI_SOURCES) \ + $(STORAGE_DRIVER_SCSI_SOURCES) \ + $(STORAGE_DRIVER_MPATH_SOURCES) \ + $(STORAGE_DRIVER_DISK_SOURCES) \ + $(STORAGE_DRIVER_RBD_SOURCES) \ + $(STORAGE_DRIVER_SHEEPDOG_SOURCES) \ + $(STORAGE_DRIVER_GLUSTER_SOURCES) \ + $(STORAGE_DRIVER_ZFS_SOURCES) \ + $(STORAGE_DRIVER_VSTORAGE_SOURCES) \ + $(STORAGE_HELPER_DISK_SOURCES) \ + $(NULL) + +storagebackenddir =3D $(libdir)/libvirt/storage-backend +storagebackend_LTLIBRARIES =3D + +# Needed to keep automake quiet about conditionals +libvirt_driver_storage_impl_la_SOURCES =3D +libvirt_driver_storage_impl_la_CFLAGS =3D \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + -I$(srcdir)/secret \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_storage_impl_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_storage_impl_la_LIBADD =3D $(SECDRIVER_LIBS) $(LIBXML_LIBS) +if WITH_BLKID +libvirt_driver_storage_impl_la_CFLAGS +=3D $(BLKID_CFLAGS) +libvirt_driver_storage_impl_la_LIBADD +=3D $(BLKID_LIBS) +endif WITH_BLKID + +if WITH_STORAGE +noinst_LTLIBRARIES +=3D libvirt_driver_storage_impl.la +libvirt_driver_storage_la_SOURCES =3D +libvirt_driver_storage_la_LIBADD =3D \ + libvirt_driver_storage_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +mod_LTLIBRARIES +=3D libvirt_driver_storage.la +libvirt_driver_storage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_storage_impl_la_SOURCES +=3D $(STORAGE_DRIVER_SOURCES) + + +libvirt_storage_backend_fs_la_SOURCES =3D $(STORAGE_DRIVER_FS_SOURCES) +libvirt_storage_backend_fs_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_fs.la +libvirt_storage_backend_fs_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +libvirt_storage_backend_fs_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE + +if WITH_STORAGE_LVM +libvirt_storage_backend_logical_la_SOURCES =3D $(STORAGE_DRIVER_LVM_SOURCE= S) +libvirt_storage_backend_logical_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_logical.la +libvirt_storage_backend_logical_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +libvirt_storage_backend_logical_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_LVM + +if WITH_STORAGE_ISCSI +libvirt_storage_backend_iscsi_la_SOURCES =3D $(STORAGE_DRIVER_ISCSI_SOURCE= S) +libvirt_storage_backend_iscsi_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + -I$(srcdir)/secret \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_iscsi.la +libvirt_storage_backend_iscsi_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +libvirt_storage_backend_iscsi_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_ISCSI + +if WITH_STORAGE_SCSI +libvirt_storage_backend_scsi_la_SOURCES =3D $(STORAGE_DRIVER_SCSI_SOURCES) +libvirt_storage_backend_scsi_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_scsi.la +libvirt_storage_backend_scsi_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +libvirt_storage_backend_scsi_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_SCSI + +if WITH_STORAGE_MPATH +libvirt_storage_backend_mpath_la_SOURCES =3D $(STORAGE_DRIVER_MPATH_SOURCE= S) +libvirt_storage_backend_mpath_la_LIBADD =3D \ + $(DEVMAPPER_LIBS) \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_storage_backend_mpath_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(DEVMAPPER_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_mpath.la +libvirt_storage_backend_mpath_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +endif WITH_STORAGE_MPATH + +if WITH_STORAGE_DISK +libvirt_storage_backend_disk_la_SOURCES =3D $(STORAGE_DRIVER_DISK_SOURCES) +libvirt_storage_backend_disk_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_disk.la +libvirt_storage_backend_disk_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +libvirt_storage_backend_disk_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_DISK + +if WITH_STORAGE_RBD +libvirt_storage_backend_rbd_la_SOURCES =3D $(STORAGE_DRIVER_RBD_SOURCES) +libvirt_storage_backend_rbd_la_LIBADD =3D \ + $(LIBRBD_LIBS) \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_storage_backend_rbd_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + -I$(srcdir)/secret \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_rbd.la +libvirt_storage_backend_rbd_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +endif WITH_STORAGE_RBD + +if WITH_STORAGE_SHEEPDOG +libvirt_storage_backend_sheepdog_la_SOURCES =3D $(STORAGE_DRIVER_SHEEPDOG_= SOURCES) +libvirt_storage_backend_sheepdog_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +libvirt_storage_backend_sheepdog_priv_la_SOURCES =3D $(STORAGE_DRIVER_SHEE= PDOG_SOURCES) +libvirt_storage_backend_sheepdog_priv_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +noinst_LTLIBRARIES +=3D libvirt_storage_backend_sheepdog_priv.la + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_sheepdog.la +libvirt_storage_backend_sheepdog_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +libvirt_storage_backend_sheepdog_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_SHEEPDOG + +if WITH_STORAGE_GLUSTER +libvirt_storage_backend_gluster_la_SOURCES =3D $(STORAGE_DRIVER_GLUSTER_SO= URCES) +libvirt_storage_backend_gluster_la_LIBADD =3D \ + $(GLUSTERFS_LIBS) \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +libvirt_storage_backend_gluster_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(GLUSTERFS_CFLAGS) \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_gluster.la +libvirt_storage_backend_gluster_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +endif WITH_STORAGE_GLUSTER + +if WITH_STORAGE_ZFS +libvirt_storage_backend_zfs_la_SOURCES =3D $(STORAGE_DRIVER_ZFS_SOURCES) +libvirt_storage_backend_zfs_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_zfs.la +libvirt_storage_backend_zfs_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +libvirt_storage_backend_zfs_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_ZFS + +if WITH_STORAGE_VSTORAGE +libvirt_storage_backend_vstorage_la_SOURCES =3D $(STORAGE_DRIVER_VSTORAGE_= SOURCES) +libvirt_storage_backend_vstorage_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) + +storagebackend_LTLIBRARIES +=3D libvirt_storage_backend_vstorage.la +libvirt_storage_backend_vstorage_la_LDFLAGS =3D $(AM_LDFLAGS_MOD) +libvirt_storage_backend_vstorage_la_LIBADD =3D \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +endif WITH_STORAGE_VSTORAGE + +if WITH_STORAGE_DISK +libexec_PROGRAMS +=3D libvirt_parthelper + +libvirt_parthelper_SOURCES =3D $(STORAGE_HELPER_DISK_SOURCES) +libvirt_parthelper_LDFLAGS =3D \ + $(AM_LDFLAGS) \ + $(PIE_LDFLAGS) \ + $(NULL) +libvirt_parthelper_LDADD =3D \ + $(LIBPARTED_LIBS) \ + libvirt_util.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +if WITH_DTRACE_PROBES +libvirt_parthelper_LDADD +=3D libvirt_probes.lo +endif WITH_DTRACE_PROBES + +libvirt_parthelper_CFLAGS =3D \ + $(LIBPARTED_CFLAGS) \ + $(AM_CFLAGS) \ + $(PIE_CFLAGS) \ + $(NULL) +endif WITH_STORAGE_DISK --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list