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 1519304199260896.5457740258266; Thu, 22 Feb 2018 04:56:39 -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 BD1EC7ECEB; Thu, 22 Feb 2018 12:56:37 +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 904ED6031B; Thu, 22 Feb 2018 12:56:37 +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 5035D4A47A; Thu, 22 Feb 2018 12:56:37 +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 w1MCuU7Z010873 for ; Thu, 22 Feb 2018 07:56:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id 0C0F8AB58E; Thu, 22 Feb 2018 12:56:30 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FC52B079B; Thu, 22 Feb 2018 12:56:29 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:12 +0000 Message-Id: <20180222125617.6768-12-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 11/16] make: split xenconfig driver build rules into xenconfig/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.28]); Thu, 22 Feb 2018 12:56:38 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 21 +-------------------- src/xenconfig/Makefile.inc.am | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 src/xenconfig/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 5968f4c5ba..2c04d3cc95 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -90,6 +90,7 @@ include vbox/Makefile.inc.am include openvz/Makefile.inc.am include qemu/Makefile.inc.am include bhyve/Makefile.inc.am +include xenconfig/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -1102,11 +1103,6 @@ CPU_SOURCES =3D \ VMX_SOURCES =3D \ vmx/vmx.c vmx/vmx.h =20 -XENCONFIG_SOURCES =3D \ - xenconfig/xenxs_private.h \ - xenconfig/xen_common.c xenconfig/xen_common.h \ - xenconfig/xen_sxpr.c xenconfig/xen_sxpr.h \ - xenconfig/xen_xm.c xenconfig/xen_xm.h if WITH_LIBXL XENCONFIG_LIBXL_SOURCES =3D \ $(XENCONFIG_SOURCES) \ @@ -1167,13 +1163,6 @@ libvirt_vmx_la_CFLAGS =3D \ libvirt_vmx_la_SOURCES =3D $(VMX_SOURCES) endif WITH_VMX =20 -if WITH_XENCONFIG -noinst_LTLIBRARIES +=3D libvirt_xenconfig.la -libvirt_la_BUILT_LIBADD +=3D libvirt_xenconfig.la -libvirt_xenconfig_la_CFLAGS =3D \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_xenconfig_la_SOURCES =3D $(XENCONFIG_SOURCES) - if WITH_LIBXL noinst_LTLIBRARIES +=3D libvirt_xenconfig_libxl.la libvirt_xenconfig_libxl_la_LIBADD =3D $(LIBXL_LIBS) @@ -1181,7 +1170,6 @@ libvirt_xenconfig_libxl_la_CFLAGS =3D \ -I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS) libvirt_xenconfig_libxl_la_SOURCES =3D $(XENCONFIG_LIBXL_SOURCES) endif WITH_LIBXL -endif WITH_XENCONFIG =20 =20 noinst_LTLIBRARIES +=3D libvirt_driver.la @@ -1842,7 +1830,6 @@ EXTRA_DIST +=3D \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(SECRET_UTIL_SOURCES) \ - $(XENCONFIG_SOURCES) \ $(XENCONFIG_LIBXL_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) =20 @@ -1990,12 +1977,6 @@ else ! WITH_VMX SYM_FILES +=3D $(srcdir)/libvirt_vmx.syms endif ! WITH_VMX =20 -if WITH_XENCONFIG -USED_SYM_FILES +=3D $(srcdir)/libvirt_xenconfig.syms -else ! WITH_XENCONFIG -SYM_FILES +=3D $(srcdir)/libvirt_xenconfig.syms -endif ! WITH_XENCONFIG - if WITH_SASL USED_SYM_FILES +=3D $(srcdir)/libvirt_sasl.syms else ! WITH_SASL diff --git a/src/xenconfig/Makefile.inc.am b/src/xenconfig/Makefile.inc.am new file mode 100644 index 0000000000..a87d69990f --- /dev/null +++ b/src/xenconfig/Makefile.inc.am @@ -0,0 +1,28 @@ +XENCONFIG_SOURCES =3D \ + xenconfig/xenxs_private.h \ + xenconfig/xen_common.c \ + xenconfig/xen_common.h \ + xenconfig/xen_sxpr.c \ + xenconfig/xen_sxpr.h \ + xenconfig/xen_xm.c \ + xenconfig/xen_xm.h \ + $(NULL) + +EXTRA_DIST +=3D $(XENCONFIG_SOURCES) + +if WITH_XENCONFIG +noinst_LTLIBRARIES +=3D libvirt_xenconfig.la +libvirt_la_BUILT_LIBADD +=3D libvirt_xenconfig.la +libvirt_xenconfig_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_xenconfig_la_SOURCES =3D $(XENCONFIG_SOURCES) + +endif WITH_XENCONFIG + +if WITH_XENCONFIG +USED_SYM_FILES +=3D $(srcdir)/libvirt_xenconfig.syms +else ! WITH_XENCONFIG +SYM_FILES +=3D $(srcdir)/libvirt_xenconfig.syms +endif ! WITH_XENCONFIG --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list