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 1519304207243451.480459679718; Thu, 22 Feb 2018 04:56:47 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 93A07C0587FA; Thu, 22 Feb 2018 12:56:44 +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 6A73360C94; Thu, 22 Feb 2018 12:56:44 +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 0DB9E18033FA; Thu, 22 Feb 2018 12:56:44 +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 w1MCuWt7010901 for ; Thu, 22 Feb 2018 07:56:33 -0500 Received: by smtp.corp.redhat.com (Postfix) id CFFCEB079B; 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 60610AF03A; Thu, 22 Feb 2018 12:56:32 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:16 +0000 Message-Id: <20180222125617.6768-16-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 15/16] make: split vz driver build rules into vz/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.12 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:45 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 31 +------------------------------ src/vz/Makefile.inc.am | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 30 deletions(-) create mode 100644 src/vz/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 1fcb864c21..7e8be8c05b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -94,6 +94,7 @@ include xenconfig/Makefile.inc.am include libxl/Makefile.inc.am include xen/Makefile.inc.am include xenapi/Makefile.inc.am +include vz/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -787,7 +788,6 @@ DRIVER_SOURCE_FILES +=3D \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(NWFILTER_DRIVER_SOURCES) \ - $(VZ_DRIVER_SOURCES) \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ @@ -801,7 +801,6 @@ STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(NWFILTER_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ - $(VZ_DRIVER_SOURCES) \ $(NULL) =20 =20 @@ -900,14 +899,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ $(DATATYPES_SOURCES) \ security/virt-aa-helper.c =20 -VZ_DRIVER_SOURCES =3D \ - vz/vz_driver.h \ - vz/vz_driver.c \ - vz/vz_utils.c \ - vz/vz_utils.h \ - vz/vz_sdk.h \ - vz/vz_sdk.c - NETWORK_DRIVER_SOURCES =3D \ network/bridge_driver.h network/bridge_driver.c \ network/bridge_driver_platform.h \ @@ -1303,25 +1294,6 @@ EXTRA_DIST +=3D lxc/lxc.conf lxc/libvirtd_lxc.aug lx= c/test_libvirtd_lxc.aug.in =20 =20 =20 - - -if WITH_VZ -noinst_LTLIBRARIES +=3D libvirt_driver_vz_impl.la -libvirt_driver_vz_la_SOURCES =3D -libvirt_driver_vz_la_LIBADD =3D libvirt_driver_vz_impl.la -mod_LTLIBRARIES +=3D libvirt_driver_vz.la -libvirt_driver_vz_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_vz_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) -libvirt_driver_vz_impl_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - -I$(srcdir)/access \ - $(AM_CFLAGS) \ - $(PARALLELS_SDK_CFLAGS) $(LIBNL_CFLAGS) -libvirt_driver_vz_impl_la_SOURCES =3D $(VZ_DRIVER_SOURCES) -libvirt_driver_vz_impl_la_LIBADD =3D $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS) -endif WITH_VZ - - if WITH_NETWORK noinst_LTLIBRARIES +=3D libvirt_driver_network_impl.la libvirt_driver_network_la_SOURCES =3D @@ -1707,7 +1679,6 @@ access/viraccessapichecklxc.c: $(srcdir)/rpc/gendispa= tch.pl \ EXTRA_DIST +=3D \ $(REMOTE_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ - $(VZ_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ diff --git a/src/vz/Makefile.inc.am b/src/vz/Makefile.inc.am new file mode 100644 index 0000000000..cacdb38795 --- /dev/null +++ b/src/vz/Makefile.inc.am @@ -0,0 +1,38 @@ +VZ_DRIVER_SOURCES =3D \ + vz/vz_driver.h \ + vz/vz_driver.c \ + vz/vz_utils.c \ + vz/vz_utils.h \ + vz/vz_sdk.h \ + vz/vz_sdk.c \ + $(NULL) + + +DRIVER_SOURCE_FILES +=3D $(VZ_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D $(VZ_DRIVER_SOURCES) +EXTRA_DIST +=3D $(VZ_DRIVER_SOURCES) + + +if WITH_VZ +noinst_LTLIBRARIES +=3D libvirt_driver_vz_impl.la +libvirt_driver_vz_la_SOURCES =3D +libvirt_driver_vz_la_LIBADD =3D \ + libvirt_driver_vz_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +mod_LTLIBRARIES +=3D libvirt_driver_vz.la +libvirt_driver_vz_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) +libvirt_driver_vz_impl_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + -I$(srcdir)/access \ + $(AM_CFLAGS) \ + $(PARALLELS_SDK_CFLAGS) \ + $(LIBNL_CFLAGS) \ + $(NULL) +libvirt_driver_vz_impl_la_SOURCES =3D $(VZ_DRIVER_SOURCES) +libvirt_driver_vz_impl_la_LIBADD =3D \ + $(PARALLELS_SDK_LIBS) \ + $(LIBNL_LIBS) \ + $(NULL) +endif WITH_VZ --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list