From nobody Wed May 14 18:33:48 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 1519304192664293.1474682766244; Thu, 22 Feb 2018 04:56:32 -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 347F290C93; 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 0662B6031B; 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 BD1DE4A471; Thu, 22 Feb 2018 12:56:30 +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 w1MCuPi1010810 for ; Thu, 22 Feb 2018 07:56:25 -0500 Received: by smtp.corp.redhat.com (Postfix) id 3FEE6AF037; Thu, 22 Feb 2018 12:56:25 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id C2D30AB58E; Thu, 22 Feb 2018 12:56:24 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:05 +0000 Message-Id: <20180222125617.6768-5-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 04/16] make: split ESX driver build rules into esx/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.29]); Thu, 22 Feb 2018 12:56:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 79 ++++--------------------------------------- src/esx/Makefile.inc.am | 90 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 97 insertions(+), 72 deletions(-) create mode 100644 src/esx/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index bec7930c2b..b952bb00e2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -69,10 +69,14 @@ noinst_LTLIBRARIES =3D mod_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D libvirt_la_BUILT_LIBADD =3D +SYM_FILES =3D +USED_SYM_FILES =3D +GENERATED_SYM_FILES =3D =20 include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am +include esx/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -761,7 +765,6 @@ check-drivername: EXTRA_DIST +=3D check-drivername.pl =20 DRIVER_SOURCE_FILES +=3D \ - $(ESX_DRIVER_SOURCES) \ $(HYPERV_DRIVER_SORUCES) \ $(INTERFACE_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ @@ -981,39 +984,6 @@ LIBXL_DRIVER_SOURCES =3D \ libxl/libxl_logger.c libxl/libxl_logger.h \ libxl/libxl_migration.c libxl/libxl_migration.h =20 -ESX_DRIVER_SOURCES =3D \ - esx/esx_private.h \ - esx/esx_driver.c esx/esx_driver.h \ - esx/esx_interface_driver.c esx/esx_interface_driver.h \ - esx/esx_network_driver.c esx/esx_network_driver.h \ - esx/esx_storage_driver.c esx/esx_storage_driver.h \ - esx/esx_storage_backend_vmfs.c esx/esx_storage_backend_vmfs.h \ - esx/esx_storage_backend_iscsi.c esx/esx_storage_backend_iscsi.h \ - esx/esx_stream.c esx/esx_stream.h \ - esx/esx_util.c esx/esx_util.h \ - esx/esx_vi.c esx/esx_vi.h \ - esx/esx_vi_methods.c esx/esx_vi_methods.h \ - esx/esx_vi_types.c esx/esx_vi_types.h - -ESX_DRIVER_GENERATED =3D \ - esx/esx_vi_methods.generated.c \ - esx/esx_vi_methods.generated.h \ - esx/esx_vi_methods.generated.macro \ - esx/esx_vi_types.generated.c \ - esx/esx_vi_types.generated.h \ - esx/esx_vi_types.generated.typedef \ - esx/esx_vi_types.generated.typeenum \ - esx/esx_vi_types.generated.typetostring \ - esx/esx_vi_types.generated.typefromstring \ - esx/esx_vi.generated.c \ - esx/esx_vi.generated.h - -ESX_DRIVER_EXTRA_DIST =3D \ - esx/README \ - esx/esx_vi_generator.input \ - esx/esx_vi_generator.py \ - $(ESX_DRIVER_GENERATED) - HYPERV_DRIVER_SOURCES =3D \ hyperv/hyperv_private.h \ hyperv/hyperv_driver.c hyperv/hyperv_driver.h \ @@ -1325,9 +1295,9 @@ libvirt_driver_la_LIBADD =3D \ =20 # All .syms files should be placed in exactly one of these three lists, # depending on whether they are stored in git and/or used in the build. -SYM_FILES =3D $(USED_SYM_FILES) -USED_SYM_FILES =3D $(srcdir)/libvirt_private.syms -GENERATED_SYM_FILES =3D \ +SYM_FILES +=3D $(USED_SYM_FILES) +USED_SYM_FILES +=3D $(srcdir)/libvirt_private.syms +GENERATED_SYM_FILES +=3D \ $(ACCESS_DRIVER_SYM_FILES) \ libvirt.syms libvirt.def libvirt_qemu.def libvirt_lxc.def \ libvirt_admin.syms libvirt_admin.def \ @@ -1613,33 +1583,6 @@ EXTRA_DIST +=3D lxc/lxc.conf lxc/libvirtd_lxc.aug lx= c/test_libvirtd_lxc.aug.in =20 =20 =20 -BUILT_SOURCES +=3D $(ESX_DRIVER_GENERATED) - -ESX_GENERATED_STAMP =3D .esx_vi_generator.stamp - -EXTRA_DIST +=3D $(ESX_GENERATED_STAMP) - -$(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) - -$(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ - $(srcdir)/esx/esx_vi_generator.py - $(AM_V_GEN)srcdir=3D$(srcdir) $(PYTHON) $(srcdir)/esx/esx_vi_generator.py= \ - && touch $@ - -MAINTAINERCLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) - - -if WITH_ESX -noinst_LTLIBRARIES +=3D libvirt_driver_esx.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_esx.la -libvirt_driver_esx_la_CFLAGS =3D $(CURL_CFLAGS) \ - -I$(srcdir)/conf -I$(srcdir)/vmx $(AM_CFLAGS) -libvirt_driver_esx_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_esx_la_LIBADD =3D $(CURL_LIBS) -libvirt_driver_esx_la_SOURCES =3D $(ESX_DRIVER_SOURCES) -libvirt_driver_esx_la_DEPENDENCIES =3D $(ESX_DRIVER_GENERATED) -endif WITH_ESX - =20 BUILT_SOURCES +=3D $(HYPERV_DRIVER_GENERATED) =20 @@ -2097,8 +2040,6 @@ EXTRA_DIST +=3D \ $(VBOX_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ - $(ESX_DRIVER_SOURCES) \ - $(ESX_DRIVER_EXTRA_DIST) \ $(HYPERV_DRIVER_SOURCES) \ $(HYPERV_DRIVER_EXTRA_DIST) \ $(VZ_DRIVER_SOURCES) \ @@ -2289,12 +2230,6 @@ else ! WITH_LINUX SYM_FILES +=3D $(srcdir)/libvirt_linux.syms endif ! WITH_LINUX =20 -if WITH_ESX -USED_SYM_FILES +=3D $(srcdir)/libvirt_esx.syms -else ! WITH_ESX -SYM_FILES +=3D $(srcdir)/libvirt_esx.syms -endif ! WITH_ESX - if WITH_REMOTE USED_SYM_FILES +=3D $(srcdir)/libvirt_remote.syms else ! WITH_REMOTE diff --git a/src/esx/Makefile.inc.am b/src/esx/Makefile.inc.am new file mode 100644 index 0000000000..152dd7b979 --- /dev/null +++ b/src/esx/Makefile.inc.am @@ -0,0 +1,90 @@ +ESX_DRIVER_SOURCES =3D \ + esx/esx_private.h \ + esx/esx_driver.c \ + esx/esx_driver.h \ + esx/esx_interface_driver.c \ + esx/esx_interface_driver.h \ + esx/esx_network_driver.c \ + esx/esx_network_driver.h \ + esx/esx_storage_driver.c \ + esx/esx_storage_driver.h \ + esx/esx_storage_backend_vmfs.c \ + esx/esx_storage_backend_vmfs.h \ + esx/esx_storage_backend_iscsi.c \ + esx/esx_storage_backend_iscsi.h \ + esx/esx_stream.c \ + esx/esx_stream.h \ + esx/esx_util.c \ + esx/esx_util.h \ + esx/esx_vi.c \ + esx/esx_vi.h \ + esx/esx_vi_methods.c \ + esx/esx_vi_methods.h \ + esx/esx_vi_types.c \ + esx/esx_vi_types.h \ + $(NULL) + +ESX_DRIVER_GENERATED =3D \ + esx/esx_vi_methods.generated.c \ + esx/esx_vi_methods.generated.h \ + esx/esx_vi_methods.generated.macro \ + esx/esx_vi_types.generated.c \ + esx/esx_vi_types.generated.h \ + esx/esx_vi_types.generated.typedef \ + esx/esx_vi_types.generated.typeenum \ + esx/esx_vi_types.generated.typetostring \ + esx/esx_vi_types.generated.typefromstring \ + esx/esx_vi.generated.c \ + esx/esx_vi.generated.h \ + $(NULL) + +ESX_DRIVER_EXTRA_DIST =3D \ + esx/README \ + esx/esx_vi_generator.input \ + esx/esx_vi_generator.py \ + $(ESX_DRIVER_GENERATED) \ + $(NULL) + +ESX_GENERATED_STAMP =3D .esx_vi_generator.stamp + +DRIVER_SOURCE_FILES +=3D $(ESX_DRIVER_SOURCES) + +EXTRA_DIST +=3D \ + $(ESX_DRIVER_SOURCES) \ + $(ESX_DRIVER_EXTRA_DIST) \ + $(ESX_GENERATED_STAMP) \ + $(NULL) + +BUILT_SOURCES +=3D $(ESX_DRIVER_GENERATED) + +$(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) + +$(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ + $(srcdir)/esx/esx_vi_generator.py + $(AM_V_GEN)srcdir=3D$(srcdir) $(PYTHON) $(srcdir)/esx/esx_vi_generator.py= \ + && touch $@ + +MAINTAINERCLEANFILES +=3D $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) + +if WITH_ESX +USED_SYM_FILES +=3D $(srcdir)/libvirt_esx.syms +else ! WITH_ESX +SYM_FILES +=3D $(srcdir)/libvirt_esx.syms +endif ! WITH_ESX + + +if WITH_ESX +noinst_LTLIBRARIES +=3D libvirt_driver_esx.la +libvirt_la_BUILT_LIBADD +=3D libvirt_driver_esx.la +libvirt_driver_esx_la_CFLAGS =3D \ + $(CURL_CFLAGS) \ + -I$(srcdir)/conf \ + -I$(srcdir)/vmx \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_esx_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_esx_la_LIBADD =3D $(CURL_LIBS) +libvirt_driver_esx_la_SOURCES =3D $(ESX_DRIVER_SOURCES) +libvirt_driver_esx_la_DEPENDENCIES =3D $(ESX_DRIVER_GENERATED) + +endif WITH_ESX --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list