From nobody Wed May 14 18:39:20 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 1519304202981315.72789876314414; Thu, 22 Feb 2018 04:56:42 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E1467FDCE; Thu, 22 Feb 2018 12:56:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 705A06018D; Thu, 22 Feb 2018 12:56:41 +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 2362318033F6; Thu, 22 Feb 2018 12:56:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w1MCuWRN010890 for ; Thu, 22 Feb 2018 07:56:32 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2A3A7AF037; Thu, 22 Feb 2018 12:56:32 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id AF046B07AC; Thu, 22 Feb 2018 12:56:31 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:15 +0000 Message-Id: <20180222125617.6768-15-berrange@redhat.com> In-Reply-To: <20180222125617.6768-1-berrange@redhat.com> References: <20180222125617.6768-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v1 14/16] make: split xenapi driver build rules into xenapi/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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 22 Feb 2018 12:56:42 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 18 +----------------- src/xenapi/Makefile.inc.am | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 src/xenapi/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 1692ed6304..1fcb864c21 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -93,6 +93,7 @@ include bhyve/Makefile.inc.am include xenconfig/Makefile.inc.am include libxl/Makefile.inc.am include xen/Makefile.inc.am +include xenapi/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -790,7 +791,6 @@ DRIVER_SOURCE_FILES +=3D \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ - $(XENAPI_DRIVER_SOURCES) \ $(NULL) =20 STATEFUL_DRIVER_SOURCE_FILES +=3D \ @@ -900,11 +900,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ $(DATATYPES_SOURCES) \ security/virt-aa-helper.c =20 -XENAPI_DRIVER_SOURCES =3D \ - xenapi/xenapi_driver.c xenapi/xenapi_driver.h \ - xenapi/xenapi_driver_private.h \ - xenapi/xenapi_utils.c xenapi/xenapi_utils.h - VZ_DRIVER_SOURCES =3D \ vz/vz_driver.h \ vz/vz_driver.c \ @@ -1266,16 +1261,6 @@ EXTRA_DIST +=3D \ $< $(srcdir)/$(subst $(srcdir)/,,$@) =20 =20 -if WITH_XENAPI -noinst_LTLIBRARIES +=3D libvirt_driver_xenapi.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_xenapi.la -libvirt_driver_xenapi_la_CFLAGS =3D $(XENAPI_CFLAGS) $(CURL_CFLAGS) \ - -I$(srcdir)/conf -I$(srcdir)/xenconfig $(AM_CFLAGS) -libvirt_driver_xenapi_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_xenapi_la_LIBADD =3D $(XENAPI_LIBS) $(CURL_LIBS) -libvirt_driver_xenapi_la_SOURCES =3D $(XENAPI_DRIVER_SOURCES) -endif WITH_XENAPI - =20 =20 =20 @@ -1722,7 +1707,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispa= tch.pl \ EXTRA_DIST +=3D \ $(REMOTE_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ - $(XENAPI_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ diff --git a/src/xenapi/Makefile.inc.am b/src/xenapi/Makefile.inc.am new file mode 100644 index 0000000000..4640e9943f --- /dev/null +++ b/src/xenapi/Makefile.inc.am @@ -0,0 +1,28 @@ +XENAPI_DRIVER_SOURCES =3D \ + xenapi/xenapi_driver.c \ + xenapi/xenapi_driver.h \ + xenapi/xenapi_driver_private.h \ + xenapi/xenapi_utils.c \ + xenapi/xenapi_utils.h \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D $(XENAPI_DRIVER_SOURCES) +EXTRA_DIST +=3D $(XENAPI_DRIVER_SOURCES) + +if WITH_XENAPI +noinst_LTLIBRARIES +=3D libvirt_driver_xenapi.la +libvirt_la_BUILT_LIBADD +=3D libvirt_driver_xenapi.la +libvirt_driver_xenapi_la_CFLAGS =3D \ + $(XENAPI_CFLAGS) \ + $(CURL_CFLAGS) \ + -I$(srcdir)/conf \ + -I$(srcdir)/xenconfig \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_xenapi_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_xenapi_la_LIBADD =3D \ + $(XENAPI_LIBS) \ + $(CURL_LIBS) \ + $(NULL) +libvirt_driver_xenapi_la_SOURCES =3D $(XENAPI_DRIVER_SOURCES) +endif WITH_XENAPI --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list