From nobody Wed May 14 18:38:27 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 1519304196663833.4759461806017; Thu, 22 Feb 2018 04:56:36 -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 E0C0C7FDC5; Thu, 22 Feb 2018 12:56:34 +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 907655D965; Thu, 22 Feb 2018 12:56:34 +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 035B618033EA; Thu, 22 Feb 2018 12:56:34 +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 w1MCuQ6u010817 for ; Thu, 22 Feb 2018 07:56:26 -0500 Received: by smtp.corp.redhat.com (Postfix) id E83BFAF03A; 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 76FEAAB58E; Thu, 22 Feb 2018 12:56:25 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:06 +0000 Message-Id: <20180222125617.6768-6-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 05/16] make: split hyperv driver build rules into hyperv/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.27]); Thu, 22 Feb 2018 12:56:35 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 47 +----------------------------------- src/hyperv/Makefile.inc.am | 59 ++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 60 insertions(+), 46 deletions(-) create mode 100644 src/hyperv/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index b952bb00e2..a5986cee99 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -77,6 +77,7 @@ include uml/Makefile.inc.am include phyp/Makefile.inc.am include test/Makefile.inc.am include esx/Makefile.inc.am +include hyperv/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -765,7 +766,6 @@ check-drivername: EXTRA_DIST +=3D check-drivername.pl =20 DRIVER_SOURCE_FILES +=3D \ - $(HYPERV_DRIVER_SORUCES) \ $(INTERFACE_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ @@ -984,24 +984,6 @@ LIBXL_DRIVER_SOURCES =3D \ libxl/libxl_logger.c libxl/libxl_logger.h \ libxl/libxl_migration.c libxl/libxl_migration.h =20 -HYPERV_DRIVER_SOURCES =3D \ - hyperv/hyperv_private.h \ - hyperv/hyperv_driver.c hyperv/hyperv_driver.h \ - hyperv/hyperv_util.c hyperv/hyperv_util.h \ - hyperv/hyperv_wmi.c hyperv/hyperv_wmi.h \ - hyperv/hyperv_wmi_classes.c hyperv/hyperv_wmi_classes.h \ - hyperv/openwsman.h - -HYPERV_DRIVER_GENERATED =3D \ - hyperv/hyperv_wmi_classes.generated.c \ - hyperv/hyperv_wmi_classes.generated.h \ - hyperv/hyperv_wmi_classes.generated.typedef - -HYPERV_DRIVER_EXTRA_DIST =3D \ - hyperv/hyperv_wmi_generator.input \ - hyperv/hyperv_wmi_generator.py \ - $(HYPERV_DRIVER_GENERATED) - VZ_DRIVER_SOURCES =3D \ vz/vz_driver.h \ vz/vz_driver.c \ @@ -1584,31 +1566,6 @@ EXTRA_DIST +=3D lxc/lxc.conf lxc/libvirtd_lxc.aug lx= c/test_libvirtd_lxc.aug.in =20 =20 =20 -BUILT_SOURCES +=3D $(HYPERV_DRIVER_GENERATED) - -HYPERV_GENERATED_STAMP =3D .hyperv_wmi_generator.stamp - -EXTRA_DIST +=3D $(HYPERV_GENERATED_STAMP) - -$(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP) - -$(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ - $(srcdir)/hyperv/hyperv_wmi_generator.py - $(AM_V_GEN)srcdir=3D$(srcdir) $(PYTHON) \ - $(srcdir)/hyperv/hyperv_wmi_generator.py \ - && touch $@ - -MAINTAINERCLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_ST= AMP) - -if WITH_HYPERV -noinst_LTLIBRARIES +=3D libvirt_driver_hyperv.la -libvirt_la_BUILT_LIBADD +=3D libvirt_driver_hyperv.la -libvirt_driver_hyperv_la_CFLAGS =3D $(OPENWSMAN_CFLAGS) \ - -I$(srcdir)/conf $(AM_CFLAGS) -libvirt_driver_hyperv_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_hyperv_la_LIBADD =3D $(OPENWSMAN_LIBS) -libvirt_driver_hyperv_la_SOURCES =3D $(HYPERV_DRIVER_SOURCES) -endif WITH_HYPERV =20 if WITH_VZ noinst_LTLIBRARIES +=3D libvirt_driver_vz_impl.la @@ -2040,8 +1997,6 @@ EXTRA_DIST +=3D \ $(VBOX_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ - $(HYPERV_DRIVER_SOURCES) \ - $(HYPERV_DRIVER_EXTRA_DIST) \ $(VZ_DRIVER_SOURCES) \ $(BHYVE_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ diff --git a/src/hyperv/Makefile.inc.am b/src/hyperv/Makefile.inc.am new file mode 100644 index 0000000000..1478d77b08 --- /dev/null +++ b/src/hyperv/Makefile.inc.am @@ -0,0 +1,59 @@ +HYPERV_DRIVER_SOURCES =3D \ + hyperv/hyperv_private.h \ + hyperv/hyperv_driver.c \ + hyperv/hyperv_driver.h \ + hyperv/hyperv_util.c \ + hyperv/hyperv_util.h \ + hyperv/hyperv_wmi.c \ + hyperv/hyperv_wmi.h \ + hyperv/hyperv_wmi_classes.c \ + hyperv/hyperv_wmi_classes.h \ + hyperv/openwsman.h \ + $(NULL) + +HYPERV_DRIVER_GENERATED =3D \ + hyperv/hyperv_wmi_classes.generated.c \ + hyperv/hyperv_wmi_classes.generated.h \ + hyperv/hyperv_wmi_classes.generated.typedef \ + $(NULL) + +HYPERV_GENERATED_STAMP =3D .hyperv_wmi_generator.stamp + +HYPERV_DRIVER_EXTRA_DIST =3D \ + hyperv/hyperv_wmi_generator.input \ + hyperv/hyperv_wmi_generator.py \ + $(HYPERV_DRIVER_GENERATED) \ + $(HYPERV_GENERATED_STAMP) \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D $(HYPERV_DRIVER_SORUCES) + +EXTRA_DIST +=3D \ + $(HYPERV_DRIVER_SORUCES) \ + $(HYPERV_DRIVER_EXTRA_DIST) \ + $(NULL) + +BUILT_SOURCES +=3D $(HYPERV_DRIVER_GENERATED) + +$(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP) + +$(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ + $(srcdir)/hyperv/hyperv_wmi_generator.py + $(AM_V_GEN)srcdir=3D$(srcdir) $(PYTHON) \ + $(srcdir)/hyperv/hyperv_wmi_generator.py \ + && touch $@ + +MAINTAINERCLEANFILES +=3D $(HYPERV_DRIVER_GENERATED) + +if WITH_HYPERV +noinst_LTLIBRARIES +=3D libvirt_driver_hyperv.la +libvirt_la_BUILT_LIBADD +=3D libvirt_driver_hyperv.la +libvirt_driver_hyperv_la_CFLAGS =3D \ + $(OPENWSMAN_CFLAGS) \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_hyperv_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_hyperv_la_LIBADD =3D $(OPENWSMAN_LIBS) +libvirt_driver_hyperv_la_SOURCES =3D $(HYPERV_DRIVER_SOURCES) +endif WITH_HYPERV --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list