From nobody Wed May 14 18:34:42 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 1519304200470224.50710701617209; Thu, 22 Feb 2018 04:56:40 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 29CC619CBCF; Thu, 22 Feb 2018 12:56:39 +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 E4BCE5D973; Thu, 22 Feb 2018 12:56:38 +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 812294A47D; Thu, 22 Feb 2018 12:56:38 +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 w1MCuRLY010836 for ; Thu, 22 Feb 2018 07:56:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id 4E1A0AF03A; 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 D20B8AB58E; Thu, 22 Feb 2018 12:56:26 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:08 +0000 Message-Id: <20180222125617.6768-8-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 07/16] make: split vbox driver build rules into vbox/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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 22 Feb 2018 12:56:39 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 50 +------------------------------ src/vbox/Makefile.inc.am | 76 ++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 77 insertions(+), 49 deletions(-) create mode 100644 src/vbox/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 0c1cf924e8..6100325595 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -79,6 +79,7 @@ include test/Makefile.inc.am include esx/Makefile.inc.am include hyperv/Makefile.inc.am include vmware/Makefile.inc.am +include vbox/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -781,8 +782,6 @@ DRIVER_SOURCE_FILES +=3D \ $(REMOTE_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ - $(VBOX_DRIVER_SOURCES) \ - vbox/vbox_tmpl.c \ $(XEN_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ $(NULL) @@ -914,30 +913,6 @@ OPENVZ_DRIVER_SOURCES =3D \ openvz/openvz_driver.c openvz/openvz_driver.h \ openvz/openvz_util.c openvz/openvz_util.h =20 -VBOX_DRIVER_SOURCES =3D \ - vbox/vbox_glue.c vbox/vbox_glue.h \ - vbox/vbox_driver.c vbox/vbox_driver.h \ - vbox/vbox_snapshot_conf.c vbox/vbox_snapshot_conf.h \ - vbox/vbox_V4_0.c vbox/vbox_CAPI_v4_0.h \ - vbox/vbox_V4_1.c vbox/vbox_CAPI_v4_1.h \ - vbox/vbox_V4_2.c vbox/vbox_CAPI_v4_2.h \ - vbox/vbox_V4_2_20.c vbox/vbox_CAPI_v4_2_20.h \ - vbox/vbox_V4_3.c vbox/vbox_CAPI_v4_3.h \ - vbox/vbox_V4_3_4.c vbox/vbox_CAPI_v4_3_4.h \ - vbox/vbox_V5_0.c vbox/vbox_CAPI_v5_0.h \ - vbox/vbox_V5_1.c vbox/vbox_CAPI_v5_1.h \ - vbox/vbox_V5_2.c vbox/vbox_CAPI_v5_2.h \ - vbox/vbox_common.c vbox/vbox_common.h \ - vbox/vbox_uniformed_api.h \ - vbox/vbox_get_driver.h \ - vbox/vbox_network.c \ - vbox/vbox_storage.c - -VBOX_DRIVER_EXTRA_DIST =3D \ - vbox/vbox_tmpl.c vbox/README \ - vbox/vbox_MSCOMGlue.c vbox/vbox_MSCOMGlue.h \ - vbox/vbox_XPCOMCGlue.c vbox/vbox_XPCOMCGlue.h - QEMU_DRIVER_SOURCES =3D \ qemu/qemu_agent.c qemu/qemu_agent.h \ qemu/qemu_alias.c qemu/qemu_alias.h \ @@ -1415,27 +1390,6 @@ libvirt_driver_openvz_la_CFLAGS =3D \ libvirt_driver_openvz_la_SOURCES =3D $(OPENVZ_DRIVER_SOURCES) endif WITH_OPENVZ =20 -if WITH_VBOX -noinst_LTLIBRARIES +=3D \ - libvirt_driver_vbox_impl.la -libvirt_driver_vbox_la_SOURCES =3D -libvirt_driver_vbox_la_LIBADD =3D libvirt_driver_vbox_impl.la -mod_LTLIBRARIES +=3D \ - libvirt_driver_vbox.la -libvirt_driver_vbox_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_vbox_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - -libvirt_driver_vbox_impl_la_CFLAGS =3D \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) \ - -DVBOX_DRIVER -libvirt_driver_vbox_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_vbox_impl_la_LIBADD =3D $(DLOPEN_LIBS) \ - $(WIN32_EXTRA_LIBS) \ - $(LIBXML_LIBS) -libvirt_driver_vbox_impl_la_SOURCES =3D $(VBOX_DRIVER_SOURCES) -endif WITH_VBOX - if WITH_XENAPI noinst_LTLIBRARIES +=3D libvirt_driver_xenapi.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver_xenapi.la @@ -1982,7 +1936,6 @@ EXTRA_DIST +=3D \ $(QEMU_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(OPENVZ_DRIVER_SOURCES) \ - $(VBOX_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ @@ -2009,7 +1962,6 @@ EXTRA_DIST +=3D \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(SECRET_UTIL_SOURCES) \ - $(VBOX_DRIVER_EXTRA_DIST) \ $(XENCONFIG_SOURCES) \ $(XENCONFIG_LIBXL_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) diff --git a/src/vbox/Makefile.inc.am b/src/vbox/Makefile.inc.am new file mode 100644 index 0000000000..8c76f84e82 --- /dev/null +++ b/src/vbox/Makefile.inc.am @@ -0,0 +1,76 @@ +VBOX_DRIVER_SOURCES =3D \ + vbox/vbox_glue.c \ + vbox/vbox_glue.h \ + vbox/vbox_driver.c \ + vbox/vbox_driver.h \ + vbox/vbox_snapshot_conf.c \ + vbox/vbox_snapshot_conf.h \ + vbox/vbox_V4_0.c \ + vbox/vbox_CAPI_v4_0.h \ + vbox/vbox_V4_1.c \ + vbox/vbox_CAPI_v4_1.h \ + vbox/vbox_V4_2.c \ + vbox/vbox_CAPI_v4_2.h \ + vbox/vbox_V4_2_20.c \ + vbox/vbox_CAPI_v4_2_20.h \ + vbox/vbox_V4_3.c \ + vbox/vbox_CAPI_v4_3.h \ + vbox/vbox_V4_3_4.c \ + vbox/vbox_CAPI_v4_3_4.h \ + vbox/vbox_V5_0.c \ + vbox/vbox_CAPI_v5_0.h \ + vbox/vbox_V5_1.c \ + vbox/vbox_CAPI_v5_1.h \ + vbox/vbox_V5_2.c \ + vbox/vbox_CAPI_v5_2.h \ + vbox/vbox_common.c \ + vbox/vbox_common.h \ + vbox/vbox_uniformed_api.h \ + vbox/vbox_get_driver.h \ + vbox/vbox_network.c \ + vbox/vbox_storage.c \ + $(NULL) + +VBOX_DRIVER_EXTRA_DIST =3D \ + vbox/vbox_tmpl.c \ + vbox/README \ + vbox/vbox_MSCOMGlue.c \ + vbox/vbox_MSCOMGlue.h \ + vbox/vbox_XPCOMCGlue.c \ + vbox/vbox_XPCOMCGlue.h \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D \ + $(VBOX_DRIVER_SOURCES) \ + vbox/vbox_tmpl.c \ + $(NULL) + +EXTRA_DIST +=3D \ + $(VBOX_DRIVER_SOURCES) \ + $(VBOX_DRIVER_EXTRA_DIST) \ + $(NULL) + +if WITH_VBOX +noinst_LTLIBRARIES +=3D libvirt_driver_vbox_impl.la +libvirt_driver_vbox_la_SOURCES =3D +libvirt_driver_vbox_la_LIBADD =3D \ + libvirt_driver_vbox_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +mod_LTLIBRARIES +=3D libvirt_driver_vbox.la +libvirt_driver_vbox_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) + +libvirt_driver_vbox_impl_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + -DVBOX_DRIVER \ + $(NULL) +libvirt_driver_vbox_impl_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_vbox_impl_la_LIBADD =3D \ + $(DLOPEN_LIBS) \ + $(WIN32_EXTRA_LIBS) \ + $(LIBXML_LIBS) \ + $(NULL) +libvirt_driver_vbox_impl_la_SOURCES =3D $(VBOX_DRIVER_SOURCES) +endif WITH_VBOX --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list