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 1519304213564715.6005442104398; Thu, 22 Feb 2018 04:56:53 -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 A4952C058EB0; Thu, 22 Feb 2018 12:56:50 +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 74E726047A; Thu, 22 Feb 2018 12:56:50 +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 2A41C41F69; Thu, 22 Feb 2018 12:56:50 +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 w1MCuUar010880 for ; Thu, 22 Feb 2018 07:56:30 -0500 Received: by smtp.corp.redhat.com (Postfix) id B4573B079B; Thu, 22 Feb 2018 12:56:30 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id 43E6EAF03A; Thu, 22 Feb 2018 12:56:30 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:13 +0000 Message-Id: <20180222125617.6768-13-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 12/16] make: split libxl driver build rules into libxl/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.32]); Thu, 22 Feb 2018 12:56:51 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 82 +----------------------------------- src/libxl/Makefile.inc.am | 104 ++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 106 insertions(+), 80 deletions(-) create mode 100644 src/libxl/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index 2c04d3cc95..46a5210f8a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -91,6 +91,7 @@ include openvz/Makefile.inc.am include qemu/Makefile.inc.am include bhyve/Makefile.inc.am include xenconfig/Makefile.inc.am +include libxl/Makefile.inc.am =20 install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) @@ -778,7 +779,6 @@ EXTRA_DIST +=3D check-drivername.pl =20 DRIVER_SOURCE_FILES +=3D \ $(INTERFACE_DRIVER_SOURCES) \ - $(LIBXL_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ @@ -795,7 +795,6 @@ DRIVER_SOURCE_FILES +=3D \ =20 STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(INTERFACE_DRIVER_SOURCES) \ - $(LIBXL_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(NODE_DEVICE_DRIVER_SOURCES) \ @@ -918,14 +917,6 @@ XENAPI_DRIVER_SOURCES =3D \ xenapi/xenapi_driver_private.h \ xenapi/xenapi_utils.c xenapi/xenapi_utils.h =20 -LIBXL_DRIVER_SOURCES =3D \ - libxl/libxl_conf.c libxl/libxl_conf.h \ - libxl/libxl_capabilities.c libxl/libxl_capabilities.h \ - libxl/libxl_domain.c libxl/libxl_domain.h \ - libxl/libxl_driver.c libxl/libxl_driver.h \ - libxl/libxl_logger.c libxl/libxl_logger.h \ - libxl/libxl_migration.c libxl/libxl_migration.h - VZ_DRIVER_SOURCES =3D \ vz/vz_driver.h \ vz/vz_driver.c \ @@ -1103,11 +1094,6 @@ CPU_SOURCES =3D \ VMX_SOURCES =3D \ vmx/vmx.c vmx/vmx.h =20 -if WITH_LIBXL -XENCONFIG_LIBXL_SOURCES =3D \ - $(XENCONFIG_SOURCES) \ - xenconfig/xen_xl.c xenconfig/xen_xl.h -endif WITH_LIBXL =20 pkgdata_DATA =3D cpu/cpu_map.xml =20 @@ -1163,14 +1149,6 @@ libvirt_vmx_la_CFLAGS =3D \ libvirt_vmx_la_SOURCES =3D $(VMX_SOURCES) endif WITH_VMX =20 -if WITH_LIBXL -noinst_LTLIBRARIES +=3D libvirt_xenconfig_libxl.la -libvirt_xenconfig_libxl_la_LIBADD =3D $(LIBXL_LIBS) -libvirt_xenconfig_libxl_la_CFLAGS =3D \ - -I$(srcdir)/conf -I$(srcdir)/libxl $(AM_CFLAGS) -libvirt_xenconfig_libxl_la_SOURCES =3D $(XENCONFIG_LIBXL_SOURCES) -endif WITH_LIBXL - =20 noinst_LTLIBRARIES +=3D libvirt_driver.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver.la @@ -1328,36 +1306,6 @@ libvirt_driver_xenapi_la_LIBADD =3D $(XENAPI_LIBS) $= (CURL_LIBS) libvirt_driver_xenapi_la_SOURCES =3D $(XENAPI_DRIVER_SOURCES) endif WITH_XENAPI =20 -if WITH_LIBXL -noinst_LTLIBRARIES +=3D libvirt_driver_libxl_impl.la -libvirt_driver_libxl_la_SOURCES =3D -libvirt_driver_libxl_la_LIBADD =3D libvirt_driver_libxl_impl.la -mod_LTLIBRARIES +=3D libvirt_driver_libxl.la -libvirt_driver_libxl_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_libxl_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - -libvirt_driver_libxl_impl_la_CFLAGS =3D \ - $(LIBXL_CFLAGS) \ - $(LIBXML_CFLAGS) \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - -I$(srcdir)/secret \ - -I$(srcdir)/xenconfig \ - $(AM_CFLAGS) -libvirt_driver_libxl_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -libvirt_driver_libxl_impl_la_LIBADD =3D $(LIBXL_LIBS) \ - $(LIBXML_LIBS) \ - libvirt_xenconfig_libxl.la -libvirt_driver_libxl_impl_la_SOURCES =3D $(LIBXL_DRIVER_SOURCES) - -conf_DATA +=3D libxl/libxl.conf -augeas_DATA +=3D libxl/libvirtd_libxl.aug -augeastest_DATA +=3D test_libvirtd_libxl.aug -CLEANFILES +=3D test_libvirtd_libxl.aug - -endif WITH_LIBXL -EXTRA_DIST +=3D libxl/libxl.conf libxl/libvirtd_libxl.aug \ - libxl/test_libvirtd_libxl.aug.in =20 =20 =20 @@ -1806,7 +1754,6 @@ EXTRA_DIST +=3D \ $(XEN_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(XENAPI_DRIVER_SOURCES) \ - $(LIBXL_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ @@ -1830,7 +1777,6 @@ EXTRA_DIST +=3D \ $(SECURITY_DRIVER_APPARMOR_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(SECRET_UTIL_SOURCES) \ - $(XENCONFIG_LIBXL_SOURCES) \ $(ACCESS_DRIVER_POLKIT_POLICY) =20 check-local: check-augeas @@ -1839,13 +1785,12 @@ check-local: check-augeas check-augeas-lxc \ check-augeas-sanlock \ check-augeas-lockd \ - check-augeas-libxl \ 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-lockd check-augeas-virtlockd \ check-augeas-virtlogd check-augeas-libvirtd =20 AUG_GENTEST =3D $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl @@ -1903,19 +1848,6 @@ check-augeas-virtlockd: test_virtlockd.aug '$(AUGPARSE)' -I $(srcdir)/locking test_virtlockd.aug; \ fi =20 -if WITH_LIBXL -test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \ - $(srcdir)/libxl/libxl.conf $(AUG_GENTEST) - $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< $@ - -check-augeas-libxl: test_libvirtd_libxl.aug - $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ - '$(AUGPARSE)' -I $(srcdir)/libxl test_libvirtd_libxl.aug; \ - fi -else ! WITH_LIBXL -check-augeas-libxl: -endif ! WITH_LIBXL - =20 test_virtlogd.aug: logging/test_virtlogd.aug.in \ logging/virtlogd.conf $(AUG_GENTEST) @@ -3186,11 +3118,6 @@ if WITH_LXC $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" endif WITH_LXC -if WITH_LIBXL - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" -endif WITH_LIBXL if WITH_XEN $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" endif WITH_XEN @@ -3235,11 +3162,6 @@ if WITH_LXC rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/lxc" ||: rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/lxc" ||: endif WITH_LXC -if WITH_LIBXL - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||: - rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||: - rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||: -endif WITH_LIBXL if WITH_XEN rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||: endif WITH_XEN diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am new file mode 100644 index 0000000000..59c136bf4e --- /dev/null +++ b/src/libxl/Makefile.inc.am @@ -0,0 +1,104 @@ +LIBXL_DRIVER_SOURCES =3D \ + libxl/libxl_conf.c \ + libxl/libxl_conf.h \ + libxl/libxl_capabilities.c \ + libxl/libxl_capabilities.h \ + libxl/libxl_domain.c \ + libxl/libxl_domain.h \ + libxl/libxl_driver.c \ + libxl/libxl_driver.h \ + libxl/libxl_logger.c \ + libxl/libxl_logger.h \ + libxl/libxl_migration.c \ + libxl/libxl_migration.h \ + $(NULL) + +XENCONFIG_LIBXL_SOURCES =3D \ + $(XENCONFIG_SOURCES) \ + xenconfig/xen_xl.c \ + xenconfig/xen_xl.h \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D $(LIBXL_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D $(LIBXL_DRIVER_SOURCES) +EXTRA_DIST +=3D \ + $(LIBXL_DRIVER_SOURCES) \ + $(XENCONFIG_LIBXL_SOURCES) \ + $(NULL) + +if WITH_LIBXL +noinst_LTLIBRARIES +=3D libvirt_xenconfig_libxl.la +libvirt_xenconfig_libxl_la_LIBADD =3D $(LIBXL_LIBS) +libvirt_xenconfig_libxl_la_CFLAGS =3D \ + -I$(srcdir)/conf \ + -I$(srcdir)/libxl \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_xenconfig_libxl_la_SOURCES =3D $(XENCONFIG_LIBXL_SOURCES) + +noinst_LTLIBRARIES +=3D libvirt_driver_libxl_impl.la +libvirt_driver_libxl_la_SOURCES =3D +libvirt_driver_libxl_la_LIBADD =3D \ + libvirt_driver_libxl_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +mod_LTLIBRARIES +=3D libvirt_driver_libxl.la +libvirt_driver_libxl_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) + +libvirt_driver_libxl_impl_la_CFLAGS =3D \ + $(LIBXL_CFLAGS) \ + $(LIBXML_CFLAGS) \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + -I$(srcdir)/secret \ + -I$(srcdir)/xenconfig \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_libxl_impl_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_libxl_impl_la_LIBADD =3D \ + $(LIBXL_LIBS) \ + $(LIBXML_LIBS) \ + libvirt_xenconfig_libxl.la \ + $(NULL) +libvirt_driver_libxl_impl_la_SOURCES =3D $(LIBXL_DRIVER_SOURCES) + +conf_DATA +=3D libxl/libxl.conf +augeas_DATA +=3D libxl/libvirtd_libxl.aug +augeastest_DATA +=3D test_libvirtd_libxl.aug +CLEANFILES +=3D test_libvirtd_libxl.aug + +AUGEAS_DIRS +=3D libxl + +test_libvirtd_libxl.aug: libxl/test_libvirtd_libxl.aug.in \ + $(srcdir)/libxl/libxl.conf $(AUG_GENTEST) + $(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/libxl/libxl.conf $< $@ + +check-augeas-libxl: test_libvirtd_libxl.aug + $(AM_V_GEN)if test -x '$(AUGPARSE)'; then \ + '$(AUGPARSE)' -I $(srcdir)/libxl test_libvirtd_libxl.aug; \ + fi + +INSTALL_DATA_DIRS +=3D libxl + +install-data-libxl: + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" + +uninstall-data-libxl: + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/libxl" ||: + rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||: + rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||: + +endif WITH_LIBXL + +.PHONY: \ + check-augeas-libxl \ + $(NULL) + +EXTRA_DIST +=3D \ + libxl/libxl.conf \ + libxl/libvirtd_libxl.aug \ + libxl/test_libvirtd_libxl.aug.in \ + $(NULL) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list