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 1519304197222506.0920979473143; Thu, 22 Feb 2018 04:56:37 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 95B167FDCB; Thu, 22 Feb 2018 12:56:35 +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 5AF0E5EDEA; Thu, 22 Feb 2018 12:56:35 +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 0AEA318033F0; Thu, 22 Feb 2018 12:56:35 +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 w1MCuTNX010865 for ; Thu, 22 Feb 2018 07:56:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5A366AF03A; Thu, 22 Feb 2018 12:56:29 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCB18B07AC; Thu, 22 Feb 2018 12:56:28 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:11 +0000 Message-Id: <20180222125617.6768-11-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 10/16] make: split bhyve driver build rules into bhyve/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.15 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:36 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 62 ++-------------------------------------- src/bhyve/Makefile.inc.am | 73 +++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 75 insertions(+), 60 deletions(-) create mode 100644 src/bhyve/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 18566ca920..5968f4c5ba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -89,6 +89,7 @@ include vmware/Makefile.inc.am include vbox/Makefile.inc.am include openvz/Makefile.inc.am include qemu/Makefile.inc.am +include bhyve/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -792,7 +793,6 @@ DRIVER_SOURCE_FILES +=3D \ $(NULL) =20 STATEFUL_DRIVER_SOURCE_FILES +=3D \ - $(BHYVE_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ @@ -933,28 +933,6 @@ VZ_DRIVER_SOURCES =3D \ vz/vz_sdk.h \ vz/vz_sdk.c =20 -BHYVE_DRIVER_SOURCES =3D \ - bhyve/bhyve_capabilities.c \ - bhyve/bhyve_capabilities.h \ - bhyve/bhyve_command.c \ - bhyve/bhyve_command.h \ - bhyve/bhyve_conf.c \ - bhyve/bhyve_conf.h \ - bhyve/bhyve_parse_command.c \ - bhyve/bhyve_parse_command.h \ - bhyve/bhyve_device.c \ - bhyve/bhyve_device.h \ - bhyve/bhyve_domain.c \ - bhyve/bhyve_domain.h \ - bhyve/bhyve_driver.h \ - bhyve/bhyve_driver.c \ - bhyve/bhyve_monitor.c \ - bhyve/bhyve_monitor.h \ - bhyve/bhyve_process.c \ - bhyve/bhyve_process.h \ - bhyve/bhyve_utils.h \ - $(NULL) - NETWORK_DRIVER_SOURCES =3D \ network/bridge_driver.h network/bridge_driver.c \ network/bridge_driver_platform.h \ @@ -1452,28 +1430,6 @@ libvirt_driver_vz_impl_la_SOURCES =3D $(VZ_DRIVER_SO= URCES) libvirt_driver_vz_impl_la_LIBADD =3D $(PARALLELS_SDK_LIBS) $(LIBNL_LIBS) endif WITH_VZ =20 -if WITH_BHYVE -noinst_LTLIBRARIES +=3D libvirt_driver_bhyve_impl.la -libvirt_driver_bhyve_la_SOURCES =3D -libvirt_driver_bhyve_la_LIBADD =3D libvirt_driver_bhyve_impl.la -mod_LTLIBRARIES +=3D libvirt_driver_bhyve.la -libvirt_driver_bhyve_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_bhyve_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - -libvirt_driver_bhyve_impl_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -libvirt_driver_bhyve_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_bhyve_impl_la_SOURCES =3D $(BHYVE_DRIVER_SOURCES) - -conf_DATA +=3D bhyve/bhyve.conf -augeas_DATA +=3D bhyve/libvirtd_bhyve.aug -augeastest_DATA +=3D test_libvirtd_bhyve.aug -endif WITH_BHYVE -EXTRA_DIST +=3D bhyve/bhyve.conf \ - bhyve/libvirtd_bhyve.aug \ - bhyve/test_libvirtd_bhyve.aug.in =20 if WITH_NETWORK noinst_LTLIBRARIES +=3D libvirt_driver_network_impl.la @@ -1864,7 +1820,6 @@ EXTRA_DIST +=3D \ $(XENAPI_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ - $(BHYVE_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ @@ -1898,14 +1853,13 @@ check-local: check-augeas check-augeas-sanlock \ check-augeas-lockd \ check-augeas-libxl \ - check-augeas-bhyve \ check-augeas-libvirtd \ $(NULL) =20 check-augeas: $(AUGEAS_DIRS:%=3Dcheck-augeas-%) \ check-augeas-lxc check-augeas-sanlock \ check-augeas-lockd check-augeas-virtlockd check-augeas-libxl \ - check-augeas-bhyve check-augeas-virtlogd check-augeas-libvirtd + check-augeas-virtlogd check-augeas-libvirtd =20 AUG_GENTEST =3D $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl EXTRA_DIST +=3D $(top_srcdir)/build-aux/augeas-gentest.pl @@ -1975,18 +1929,6 @@ else ! WITH_LIBXL check-augeas-libxl: endif ! WITH_LIBXL =20 -if WITH_BHYVE -test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \ - $(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< $@ - -check-augeas-bhyve: test_libvirtd_bhyve.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/bhyve test_libvirtd_bhyve.aug; \ - fi -else ! WITH_BHYVE -check-augeas-bhyve: -endif ! WITH_BHYVE =20 test_virtlogd.aug: logging/test_virtlogd.aug.in \ logging/virtlogd.conf $(AUG_GENTEST) diff --git a/src/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am new file mode 100644 index 0000000000..fba1b9ef30 --- /dev/null +++ b/src/bhyve/Makefile.inc.am @@ -0,0 +1,73 @@ +BHYVE_DRIVER_SOURCES =3D \ + bhyve/bhyve_capabilities.c \ + bhyve/bhyve_capabilities.h \ + bhyve/bhyve_command.c \ + bhyve/bhyve_command.h \ + bhyve/bhyve_conf.c \ + bhyve/bhyve_conf.h \ + bhyve/bhyve_parse_command.c \ + bhyve/bhyve_parse_command.h \ + bhyve/bhyve_device.c \ + bhyve/bhyve_device.h \ + bhyve/bhyve_domain.c \ + bhyve/bhyve_domain.h \ + bhyve/bhyve_driver.h \ + bhyve/bhyve_driver.c \ + bhyve/bhyve_monitor.c \ + bhyve/bhyve_monitor.h \ + bhyve/bhyve_process.c \ + bhyve/bhyve_process.h \ + bhyve/bhyve_utils.h \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D $(BHYVE_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D $(BHYVE_DRIVER_SOURCES) + +EXTRA_DIST +=3D $(BHYVE_DRIVER_SOURCES) + + +if WITH_BHYVE +noinst_LTLIBRARIES +=3D libvirt_driver_bhyve_impl.la +libvirt_driver_bhyve_la_SOURCES =3D +libvirt_driver_bhyve_la_LIBADD =3D \ + libvirt_driver_bhyve_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +mod_LTLIBRARIES +=3D libvirt_driver_bhyve.la +libvirt_driver_bhyve_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) + +libvirt_driver_bhyve_impl_la_CFLAGS =3D \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_bhyve_impl_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_bhyve_impl_la_SOURCES =3D $(BHYVE_DRIVER_SOURCES) + +conf_DATA +=3D bhyve/bhyve.conf +augeas_DATA +=3D bhyve/libvirtd_bhyve.aug +augeastest_DATA +=3D test_libvirtd_bhyve.aug + +AUGEAS_DIRS +=3D bhyve + +test_libvirtd_bhyve.aug: bhyve/test_libvirtd_bhyve.aug.in \ + $(srcdir)/bhyve/bhyve.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/bhyve/bhyve.conf $< $@ + +check-augeas-bhyve: test_libvirtd_bhyve.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/bhyve test_libvirtd_bhyve.aug; \ + fi + +endif WITH_BHYVE + +EXTRA_DIST +=3D \ + bhyve/bhyve.conf \ + bhyve/libvirtd_bhyve.aug \ + bhyve/test_libvirtd_bhyve.aug.in \ + $(NULL) + +.PHONY: \ + check-augeas-bhyve \ + $(NULL) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list