From nobody Wed May 14 18:32:00 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 1519304193346215.1534497301086; Thu, 22 Feb 2018 04:56:33 -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 DF3507ECE6; Thu, 22 Feb 2018 12:56:31 +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 A6ADA4C47C; Thu, 22 Feb 2018 12:56:31 +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 6E04C4A473; Thu, 22 Feb 2018 12:56:31 +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 w1MCuQ6d010826 for ; Thu, 22 Feb 2018 07:56:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9C51BAF03A; Thu, 22 Feb 2018 12:56:26 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B041B07AC; 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:07 +0000 Message-Id: <20180222125617.6768-7-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 06/16] make: split vmware driver build rules into vmware/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.28]); Thu, 22 Feb 2018 12:56:32 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 21 +-------------------- src/vmware/Makefile.inc.am | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 src/vmware/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index a5986cee99..0c1cf924e8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -78,6 +78,7 @@ include phyp/Makefile.inc.am include test/Makefile.inc.am include esx/Makefile.inc.am include hyperv/Makefile.inc.am +include vmware/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -782,7 +783,6 @@ DRIVER_SOURCE_FILES +=3D \ $(STORAGE_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ vbox/vbox_tmpl.c \ - $(VMWARE_DRIVER_SOURCES) \ $(XEN_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ $(NULL) @@ -914,10 +914,6 @@ OPENVZ_DRIVER_SOURCES =3D \ openvz/openvz_driver.c openvz/openvz_driver.h \ openvz/openvz_util.c openvz/openvz_util.h =20 -VMWARE_DRIVER_SOURCES =3D \ - vmware/vmware_driver.c vmware/vmware_driver.h \ - vmware/vmware_conf.c vmware/vmware_conf.h - VBOX_DRIVER_SOURCES =3D \ vbox/vbox_glue.c vbox/vbox_glue.h \ vbox/vbox_driver.c vbox/vbox_driver.h \ @@ -1419,14 +1415,6 @@ libvirt_driver_openvz_la_CFLAGS =3D \ libvirt_driver_openvz_la_SOURCES =3D $(OPENVZ_DRIVER_SOURCES) endif WITH_OPENVZ =20 -if WITH_VMWARE -noinst_LTLIBRARIES +=3D libvirt_driver_vmware.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_vmware.la -libvirt_driver_vmware_la_CFLAGS =3D \ - -I$(srcdir)/conf -I$(srcdir)/vmx $(AM_CFLAGS) -libvirt_driver_vmware_la_SOURCES =3D $(VMWARE_DRIVER_SOURCES) -endif WITH_VMWARE - if WITH_VBOX noinst_LTLIBRARIES +=3D \ libvirt_driver_vbox_impl.la @@ -2022,7 +2010,6 @@ EXTRA_DIST +=3D \ $(SECRET_DRIVER_SOURCES) \ $(SECRET_UTIL_SOURCES) \ $(VBOX_DRIVER_EXTRA_DIST) \ - $(VMWARE_DRIVER_SOURCES) \ $(XENCONFIG_SOURCES) \ $(XENCONFIG_LIBXL_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) @@ -2203,12 +2190,6 @@ else ! WITH_VMX SYM_FILES +=3D $(srcdir)/libvirt_vmx.syms endif ! WITH_VMX =20 -if WITH_VMWARE -USED_SYM_FILES +=3D $(srcdir)/libvirt_vmware.syms -else ! WITH_VMWARE -SYM_FILES +=3D $(srcdir)/libvirt_vmware.syms -endif ! WITH_VMWARE - if WITH_XENCONFIG USED_SYM_FILES +=3D $(srcdir)/libvirt_xenconfig.syms else ! WITH_XENCONFIG diff --git a/src/vmware/Makefile.inc.am b/src/vmware/Makefile.inc.am new file mode 100644 index 0000000000..0fbf866030 --- /dev/null +++ b/src/vmware/Makefile.inc.am @@ -0,0 +1,27 @@ +VMWARE_DRIVER_SOURCES =3D \ + vmware/vmware_driver.c \ + vmware/vmware_driver.h \ + vmware/vmware_conf.c \ + vmware/vmware_conf.h \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D $(VMWARE_DRIVER_SOURCES) + +EXTRA_DIST +=3D $(VMWARE_DRIVER_SOURCES) + +if WITH_VMWARE +noinst_LTLIBRARIES +=3D libvirt_driver_vmware.la +libvirt_la_BUILT_LIBADD +=3D libvirt_driver_vmware.la +libvirt_driver_vmware_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + -I$(srcdir)/vmx \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_vmware_la_SOURCES =3D $(VMWARE_DRIVER_SOURCES) +endif WITH_VMWARE + +if WITH_VMWARE +USED_SYM_FILES +=3D $(srcdir)/libvirt_vmware.syms +else ! WITH_VMWARE +SYM_FILES +=3D $(srcdir)/libvirt_vmware.syms +endif ! WITH_VMWARE --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list