From nobody Wed May 14 18:35:46 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 1519304205755249.62466525267848; Thu, 22 Feb 2018 04:56:45 -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 D03E9C0587C5; Thu, 22 Feb 2018 12:56:42 +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 A97B16031B; Thu, 22 Feb 2018 12:56:42 +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 7084D4A482; Thu, 22 Feb 2018 12:56:42 +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 w1MCuSpc010845 for ; Thu, 22 Feb 2018 07:56:28 -0500 Received: by smtp.corp.redhat.com (Postfix) id F40B9B079B; Thu, 22 Feb 2018 12:56:27 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 83DBDAF037; Thu, 22 Feb 2018 12:56:27 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:09 +0000 Message-Id: <20180222125617.6768-9-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 08/16] make: split openvz driver build rules into openvz/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.32]); Thu, 22 Feb 2018 12:56:43 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 22 +--------------------- src/openvz/Makefile.inc.am | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 21 deletions(-) create mode 100644 src/openvz/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 6100325595..7927bcbb04 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -80,6 +80,7 @@ include esx/Makefile.inc.am include hyperv/Makefile.inc.am include vmware/Makefile.inc.am include vbox/Makefile.inc.am +include openvz/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -776,7 +777,6 @@ DRIVER_SOURCE_FILES +=3D \ $(NODE_DEVICE_DRIVER_HAL_SOURCES) \ $(NODE_DEVICE_DRIVER_UDEV_SOURCES) \ $(NWFILTER_DRIVER_SOURCES) \ - $(OPENVZ_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ $(QEMU_DRIVER_SOURCES) \ $(REMOTE_DRIVER_SOURCES) \ @@ -908,11 +908,6 @@ SECURITY_DRIVER_APPARMOR_HELPER_SOURCES =3D \ $(DATATYPES_SOURCES) \ security/virt-aa-helper.c =20 -OPENVZ_DRIVER_SOURCES =3D \ - openvz/openvz_conf.c openvz/openvz_conf.h \ - openvz/openvz_driver.c openvz/openvz_driver.h \ - openvz/openvz_util.c openvz/openvz_util.h - QEMU_DRIVER_SOURCES =3D \ qemu/qemu_agent.c qemu/qemu_agent.h \ qemu/qemu_alias.c qemu/qemu_alias.h \ @@ -1382,14 +1377,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_OPENVZ -noinst_LTLIBRARIES +=3D libvirt_driver_openvz.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_openvz.la -libvirt_driver_openvz_la_CFLAGS =3D \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_driver_openvz_la_SOURCES =3D $(OPENVZ_DRIVER_SOURCES) -endif WITH_OPENVZ - if WITH_XENAPI noinst_LTLIBRARIES +=3D libvirt_driver_xenapi.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver_xenapi.la @@ -1935,7 +1922,6 @@ EXTRA_DIST +=3D \ $(XEN_DRIVER_SOURCES) \ $(QEMU_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ - $(OPENVZ_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ @@ -2130,12 +2116,6 @@ else ! WITH_REMOTE SYM_FILES +=3D $(srcdir)/libvirt_remote.syms endif ! WITH_REMOTE =20 -if WITH_OPENVZ -USED_SYM_FILES +=3D $(srcdir)/libvirt_openvz.syms -else ! WITH_OPENVZ -SYM_FILES +=3D $(srcdir)/libvirt_openvz.syms -endif ! WITH_OPENVZ - if WITH_VMX USED_SYM_FILES +=3D $(srcdir)/libvirt_vmx.syms else ! WITH_VMX diff --git a/src/openvz/Makefile.inc.am b/src/openvz/Makefile.inc.am new file mode 100644 index 0000000000..baad737362 --- /dev/null +++ b/src/openvz/Makefile.inc.am @@ -0,0 +1,28 @@ +OPENVZ_DRIVER_SOURCES =3D \ + openvz/openvz_conf.c \ + openvz/openvz_conf.h \ + openvz/openvz_driver.c \ + openvz/openvz_driver.h \ + openvz/openvz_util.c \ + openvz/openvz_util.h \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D $(OPENVZ_DRIVER_SOURCES) + +EXTRA_DIST +=3D $(OPENVZ_DRIVER_SOURCES) + +if WITH_OPENVZ +noinst_LTLIBRARIES +=3D libvirt_driver_openvz.la +libvirt_la_BUILT_LIBADD +=3D libvirt_driver_openvz.la +libvirt_driver_openvz_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_openvz_la_SOURCES =3D $(OPENVZ_DRIVER_SOURCES) +endif WITH_OPENVZ + +if WITH_OPENVZ +USED_SYM_FILES +=3D $(srcdir)/libvirt_openvz.syms +else ! WITH_OPENVZ +SYM_FILES +=3D $(srcdir)/libvirt_openvz.syms +endif ! WITH_OPENVZ --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list