From nobody Wed May 14 18:33:49 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 1519304191709973.1842705149917; Thu, 22 Feb 2018 04:56:31 -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 655C8C057FA9; Thu, 22 Feb 2018 12:56:30 +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 1FFD65E1CA; Thu, 22 Feb 2018 12:56:30 +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 CE24318033EE; Thu, 22 Feb 2018 12:56:29 +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 w1MCuNfV010795 for ; Thu, 22 Feb 2018 07:56:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id DAD9DAF037; Thu, 22 Feb 2018 12:56:23 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6A4CFB07AC; Thu, 22 Feb 2018 12:56:23 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:03 +0000 Message-Id: <20180222125617.6768-3-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 02/16] make: split PHyp driver build rules into phyp/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.32]); Thu, 22 Feb 2018 12:56:30 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 18 +++--------------- src/phyp/Makefile.inc.am | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 src/phyp/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 3c346b37aa..15549ec5b8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,8 +68,10 @@ STATEFUL_DRIVER_SOURCE_FILES =3D noinst_LTLIBRARIES =3D mod_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D +libvirt_la_BUILT_LIBADD =3D =20 include uml/Makefile.inc.am +include phyp/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -770,7 +772,6 @@ DRIVER_SOURCE_FILES +=3D \ $(NWFILTER_DRIVER_SOURCES) \ $(OPENVZ_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ - $(PHYP_DRIVER_SOURCES) \ $(QEMU_DRIVER_SOURCES) \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ @@ -910,9 +911,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ $(DATATYPES_SOURCES) \ security/virt-aa-helper.c =20 -PHYP_DRIVER_SOURCES =3D \ - phyp/phyp_driver.c phyp/phyp_driver.h - OPENVZ_DRIVER_SOURCES =3D \ openvz/openvz_conf.c openvz/openvz_conf.h \ openvz/openvz_driver.c openvz/openvz_driver.h \ @@ -1261,7 +1259,7 @@ EXTRA_DIST +=3D $(pkgdata_DATA) =20 noinst_LTLIBRARIES +=3D libvirt_util.la libvirt_la_LIBADD =3D $(libvirt_la_BUILT_LIBADD) -libvirt_la_BUILT_LIBADD =3D libvirt_util.la +libvirt_la_BUILT_LIBADD +=3D libvirt_util.la libvirt_util_la_SOURCES =3D \ $(UTIL_SOURCES) libvirt_util_la_CFLAGS =3D $(CAPNG_CFLAGS) $(YAJL_CFLAGS) $(LIBNL_CFLAGS) \ @@ -1478,15 +1476,6 @@ libvirt_driver_xen_impl_la_LIBADD =3D $(XEN_LIBS) li= bvirt_xenconfig.la libvirt_driver_xen_impl_la_SOURCES =3D $(XEN_DRIVER_SOURCES) endif WITH_XEN =20 -if WITH_PHYP -noinst_LTLIBRARIES +=3D libvirt_driver_phyp.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_phyp.la -libvirt_driver_phyp_la_LIBADD =3D $(SSH2_LIBS) -libvirt_driver_phyp_la_CFLAGS =3D $(SSH2_CFLAGS) \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_driver_phyp_la_SOURCES =3D $(PHYP_DRIVER_SOURCES) -endif WITH_PHYP - if WITH_OPENVZ noinst_LTLIBRARIES +=3D libvirt_driver_openvz.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver_openvz.la @@ -2124,7 +2113,6 @@ EXTRA_DIST +=3D \ $(QEMU_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(OPENVZ_DRIVER_SOURCES) \ - $(PHYP_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ diff --git a/src/phyp/Makefile.inc.am b/src/phyp/Makefile.inc.am new file mode 100644 index 0000000000..496ff25266 --- /dev/null +++ b/src/phyp/Makefile.inc.am @@ -0,0 +1,19 @@ +PHYP_DRIVER_SOURCES =3D \ + phyp/phyp_driver.c \ + phyp/phyp_driver.h \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D $(PHYP_DRIVER_SOURCES) +EXTRA_DIST +=3D $(PHYP_DRIVER_SOURCES) + +if WITH_PHYP +noinst_LTLIBRARIES +=3D libvirt_driver_phyp.la +libvirt_la_BUILT_LIBADD +=3D libvirt_driver_phyp.la +libvirt_driver_phyp_la_LIBADD =3D $(SSH2_LIBS) +libvirt_driver_phyp_la_CFLAGS =3D \ + $(SSH2_CFLAGS) \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_phyp_la_SOURCES =3D $(PHYP_DRIVER_SOURCES) +endif WITH_PHYP --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list