From nobody Wed May 14 18:31:59 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 1519304188006919.8139017772667; Thu, 22 Feb 2018 04:56:28 -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 B1DF6C0587DF; Thu, 22 Feb 2018 12:56:26 +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 820185D76A; Thu, 22 Feb 2018 12:56:26 +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 126FD18033EC; Thu, 22 Feb 2018 12:56:26 +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 w1MCuNvU010787 for ; Thu, 22 Feb 2018 07:56:23 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2FDDDAB58E; Thu, 22 Feb 2018 12:56:23 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.6]) by smtp.corp.redhat.com (Postfix) with ESMTP id B217AAF03A; Thu, 22 Feb 2018 12:56:22 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Thu, 22 Feb 2018 12:56:02 +0000 Message-Id: <20180222125617.6768-2-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 01/16] make: split UML driver build rules into uml/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.32]); Thu, 22 Feb 2018 12:56:27 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Daniel P. Berrang=C3=A9 --- src/Makefile.am | 57 +++++++++++++++------------------------------= ---- src/uml/Makefile.inc.am | 46 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 40 deletions(-) create mode 100644 src/uml/Makefile.inc.am diff --git a/src/Makefile.am b/src/Makefile.am index b8e2cbf139..3c346b37aa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in =20 -## Copyright (C) 2005-2016 Red Hat, Inc. +## Copyright (C) 2005-2018 Red Hat, Inc. ## ## This library is free software; you can redistribute it and/or ## modify it under the terms of the GNU Lesser General Public @@ -63,6 +63,17 @@ CLEANFILES =3D DISTCLEANFILES =3D MAINTAINERCLEANFILES =3D nodist_conf_DATA =3D +DRIVER_SOURCE_FILES =3D +STATEFUL_DRIVER_SOURCE_FILES =3D +noinst_LTLIBRARIES =3D +mod_LTLIBRARIES =3D +INSTALL_DATA_DIRS =3D + +include uml/Makefile.inc.am + +install-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) +uninstall-data-extra: $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) + =20 THREAD_LIBS =3D $(LIB_PTHREAD) $(LTLIBMULTITHREAD) =20 @@ -84,7 +95,6 @@ endif WITH_NETWORK lib_LTLIBRARIES =3D libvirt.la libvirt-qemu.la libvirt-lxc.la =20 moddir =3D $(libdir)/libvirt/connection-driver -mod_LTLIBRARIES =3D sbin_PROGRAMS =3D =20 confdir =3D $(sysconfdir)/libvirt @@ -747,7 +757,7 @@ check-drivername: =20 EXTRA_DIST +=3D check-drivername.pl =20 -DRIVER_SOURCE_FILES =3D \ +DRIVER_SOURCE_FILES +=3D \ $(ESX_DRIVER_SOURCES) \ $(HYPERV_DRIVER_SORUCES) \ $(INTERFACE_DRIVER_SOURCES) \ @@ -766,7 +776,6 @@ DRIVER_SOURCE_FILES =3D \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ $(TEST_DRIVER_SOURCES) \ - $(UML_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ vbox/vbox_tmpl.c \ $(VMWARE_DRIVER_SOURCES) \ @@ -774,7 +783,7 @@ DRIVER_SOURCE_FILES =3D \ $(XENAPI_DRIVER_SOURCES) \ $(NULL) =20 -STATEFUL_DRIVER_SOURCE_FILES =3D \ +STATEFUL_DRIVER_SOURCE_FILES +=3D \ $(BHYVE_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ $(LIBXL_DRIVER_SOURCES) \ @@ -785,7 +794,6 @@ STATEFUL_DRIVER_SOURCE_FILES =3D \ $(QEMU_DRIVER_SOURCES) \ $(SECRET_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ - $(UML_DRIVER_SOURCES) \ $(XEN_DRIVER_SOURCES) \ $(VZ_DRIVER_SOURCES) \ $(NULL) @@ -980,10 +988,6 @@ LIBXL_DRIVER_SOURCES =3D \ libxl/libxl_logger.c libxl/libxl_logger.h \ libxl/libxl_migration.c libxl/libxl_migration.h =20 -UML_DRIVER_SOURCES =3D \ - uml/uml_conf.c uml/uml_conf.h \ - uml/uml_driver.c uml/uml_driver.h - ESX_DRIVER_SOURCES =3D \ esx/esx_private.h \ esx/esx_driver.c esx/esx_driver.h \ @@ -1255,7 +1259,7 @@ EXTRA_DIST +=3D $(pkgdata_DATA) # # First deal with sources usable in non-daemon context =20 -noinst_LTLIBRARIES =3D libvirt_util.la +noinst_LTLIBRARIES +=3D libvirt_util.la libvirt_la_LIBADD =3D $(libvirt_la_BUILT_LIBADD) libvirt_la_BUILT_LIBADD =3D libvirt_util.la libvirt_util_la_SOURCES =3D \ @@ -1635,22 +1639,6 @@ CLEANFILES +=3D test_libvirtd_lxc.aug endif WITH_LXC EXTRA_DIST +=3D lxc/lxc.conf lxc/libvirtd_lxc.aug lxc/test_libvirtd_lxc.au= g.in =20 -if WITH_UML -noinst_LTLIBRARIES +=3D libvirt_driver_uml_impl.la -libvirt_driver_uml_la_SOURCES =3D -libvirt_driver_uml_la_LIBADD =3D libvirt_driver_uml_impl.la -mod_LTLIBRARIES +=3D libvirt_driver_uml.la -libvirt_driver_uml_la_LIBADD +=3D libvirt.la ../gnulib/lib/libgnu.la -libvirt_driver_uml_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) - -libvirt_driver_uml_impl_la_CFLAGS =3D \ - -I$(srcdir)/access \ - -I$(srcdir)/conf \ - $(AM_CFLAGS) -libvirt_driver_uml_impl_la_LDFLAGS =3D $(AM_LDFLAGS) -# libvirt_driver_uml_impl_la_LIBADD =3D -libvirt_driver_uml_impl_la_SOURCES =3D $(UML_DRIVER_SOURCES) -endif WITH_UML =20 =20 BUILT_SOURCES +=3D $(ESX_DRIVER_GENERATED) @@ -2135,7 +2123,6 @@ EXTRA_DIST +=3D \ $(XEN_DRIVER_SOURCES) \ $(QEMU_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ - $(UML_DRIVER_SOURCES) \ $(OPENVZ_DRIVER_SOURCES) \ $(PHYP_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ @@ -3567,7 +3554,7 @@ endif WITH_NSS =20 install-data-local: install-init install-systemd install-upstart \ install-sysctl install-polkit install-sasl \ - install-logrotate + install-logrotate install-data-extra if WITH_LIBVIRTD $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd" @@ -3597,11 +3584,6 @@ if WITH_LIBXL $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" endif WITH_LIBXL -if WITH_UML - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml" - $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/uml" -endif WITH_UML if WITH_XEN $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" endif WITH_XEN @@ -3627,7 +3609,7 @@ endif WITH_NETWORK =20 uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \ uninstall-sysctl uninstall-polkit uninstall-sasl \ - uninstall-logrotate + uninstall-logrotate uninstall-data-extra if WITH_LIBVIRTD rmdir "$(DESTDIR)$(localstatedir)/log/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/lockd/files" ||: @@ -3657,11 +3639,6 @@ if WITH_LIBXL rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/libxl" ||: rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/libxl" ||: endif WITH_LIBXL -if WITH_UML - rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||: - rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||: - rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/uml" ||: -endif WITH_UML if WITH_XEN rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/xen" ||: endif WITH_XEN diff --git a/src/uml/Makefile.inc.am b/src/uml/Makefile.inc.am new file mode 100644 index 0000000000..2a53d98efb --- /dev/null +++ b/src/uml/Makefile.inc.am @@ -0,0 +1,46 @@ +UML_DRIVER_SOURCES =3D \ + uml/uml_conf.c uml/uml_conf.h \ + uml/uml_driver.c uml/uml_driver.h \ + $(NULL) + +DRIVER_SOURCE_FILES +=3D $(UML_DRIVER_SOURCES) +STATEFUL_DRIVER_SOURCE_FILES +=3D $(UML_DRIVER_SOURCES) +EXTRA_DIST +=3D $(UML_DRIVER_SOURCES) + +if WITH_UML +noinst_LTLIBRARIES +=3D libvirt_driver_uml_impl.la +libvirt_driver_uml_la_SOURCES =3D +libvirt_driver_uml_la_LIBADD =3D \ + libvirt_driver_uml_impl.la \ + libvirt.la \ + ../gnulib/lib/libgnu.la \ + $(NULL) +mod_LTLIBRARIES +=3D libvirt_driver_uml.la +libvirt_driver_uml_la_LDFLAGS =3D $(AM_LDFLAGS_MOD_NOUNDEF) + +libvirt_driver_uml_impl_la_CFLAGS =3D \ + -I$(srcdir)/access \ + -I$(srcdir)/conf \ + $(AM_CFLAGS) \ + $(NULL) +libvirt_driver_uml_impl_la_LDFLAGS =3D $(AM_LDFLAGS) +libvirt_driver_uml_impl_la_SOURCES =3D $(UML_DRIVER_SOURCES) + +INSTALL_DATA_DIRS +=3D uml + +install-data-uml: + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/run/libvirt/uml" + $(MKDIR_P) "$(DESTDIR)$(localstatedir)/log/libvirt/uml" + +uninstall-data-uml: + rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/uml" ||: + rmdir "$(DESTDIR)$(localstatedir)/run/libvirt/uml" ||: + rmdir "$(DESTDIR)$(localstatedir)/log/libvirt/uml" ||: + +endif WITH_UML + +.PHONY: \ + install-data-uml \ + uninstall-data-uml \ + $(NULL) --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list