From nobody Mon Feb 9 15:10:09 2026 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 1547058974747601.4352032699912; Wed, 9 Jan 2019 10:36:14 -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 E97D9C7A2D; Wed, 9 Jan 2019 18:36:10 +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 A25129CC7; Wed, 9 Jan 2019 18:36:10 +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 599A63F602; Wed, 9 Jan 2019 18:36:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x09Ia9OO026133 for ; Wed, 9 Jan 2019 13:36:09 -0500 Received: by smtp.corp.redhat.com (Postfix) id 879A517C1A; Wed, 9 Jan 2019 18:36:09 +0000 (UTC) Received: from kinshicho.brq.redhat.com (unknown [10.43.2.212]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E4ED299C4 for ; Wed, 9 Jan 2019 18:35:59 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Wed, 9 Jan 2019 19:35:52 +0100 Message-Id: <20190109183554.12296-6-abologna@redhat.com> In-Reply-To: <20190109183554.12296-1-abologna@redhat.com> References: <20190109183554.12296-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 5/7] src: Simplify installing/uninstalling data 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-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.39]); Wed, 09 Jan 2019 18:36:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Instead of defining targets conditionally and depending on them unconditionally, define a couple of variables and conditionally add targets to them. In addition to removing a bunch of useless code, this has the nice effect of no longer requiring the main Makefile.am to have any knowledge about the contents of the various snippets it includes. Signed-off-by: Andrea Bolognani --- src/Makefile.am | 54 ++++++++++++++++---------------------- src/remote/Makefile.inc.am | 30 +++++++++------------ 2 files changed, 34 insertions(+), 50 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index d3e8a1b572..ce1a810a0f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,6 +72,8 @@ STATEFUL_DRIVER_SOURCE_FILES =3D noinst_LTLIBRARIES =3D mod_LTLIBRARIES =3D INSTALL_DATA_DIRS =3D +INSTALL_DATA_LOCAL =3D +UNINSTALL_LOCAL =3D libvirt_la_BUILT_LIBADD =3D SYM_FILES =3D USED_SYM_FILES =3D @@ -805,10 +807,10 @@ install-logrotate: $(LOGROTATE_FILES) uninstall-logrotate: rm -f $(LOGROTATE_FILES:%.logrotate=3D$(DESTDIR)$(sysconfdir)/logrotate.d= /%) rmdir $(DESTDIR)$(sysconfdir)/logrotate.d || : -else ! WITH_LIBVIRTD -install-logrotate: -uninstall-logrotate: -endif ! WITH_LIBVIRTD + +INSTALL_DATA_LOCAL +=3D install-logrotate +UNINSTALL_LOCAL +=3D uninstall-logrotate +endif WITH_LIBVIRTD =20 if LIBVIRT_INIT_SCRIPT_RED_HAT install-init:: $(SYSVINIT_FILES) install-sysconfig @@ -824,10 +826,10 @@ uninstall-init:: uninstall-sysconfig =20 BUILT_SOURCES +=3D $(SYSVINIT_FILES) DISTCLEANFILES +=3D $(SYSVINIT_FILES) -else ! LIBVIRT_INIT_SCRIPT_RED_HAT -install-init:: -uninstall-init:: -endif ! LIBVIRT_INIT_SCRIPT_RED_HAT + +INSTALL_DATA_LOCAL +=3D install-init +UNINSTALL_LOCAL +=3D uninstall-init +endif LIBVIRT_INIT_SCRIPT_RED_HAT =20 =20 %.8: %.8.in $(top_srcdir)/configure.ac @@ -847,7 +849,6 @@ EXTRA_DIST +=3D \ $(NULL) =20 =20 -if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_SYSTEMD =20 SYSTEMD_UNIT_DIR =3D $(prefix)/lib/systemd/system @@ -866,19 +867,14 @@ install-systemd: $(SYSTEMD_UNIT_FILES) install-syscon= fig uninstall-systemd: uninstall-sysconfig rm -f $(SYSTEMD_UNIT_FILES:%=3D$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%) rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || : -else ! LIBVIRT_INIT_SCRIPT_SYSTEMD -install-systemd: -uninstall-systemd: -endif ! LIBVIRT_INIT_SCRIPT_SYSTEMD -else ! WITH_LIBVIRTD -install-systemd: -uninstall-systemd: -endif ! WITH_LIBVIRTD + +INSTALL_DATA_LOCAL +=3D install-systemd +UNINSTALL_LOCAL +=3D uninstall-systemd +endif LIBVIRT_INIT_SCRIPT_SYSTEMD =20 =20 EXTRA_DIST +=3D $(UPSTART_FILES) =20 -if WITH_LIBVIRTD if LIBVIRT_INIT_SCRIPT_UPSTART =20 install-upstart: install-sysconfig @@ -897,14 +893,10 @@ uninstall-upstart: uninstall-sysconfig rm -f $(DESTDIR)$(sysconfdir)/event.d/$$tgt ; \ done rmdir $(DESTDIR)$(sysconfdir)/event.d || : -else ! LIBVIRT_INIT_SCRIPT_UPSTART -install-upstart: -uninstall-upstart: -endif ! LIBVIRT_INIT_SCRIPT_UPSTART -else ! WITH_LIBVIRTD -install-upstart: -uninstall-upstart: -endif ! WITH_LIBVIRTD + +INSTALL_DATA_LOCAL +=3D install-upstart +UNINSTALL_LOCAL +=3D uninstall-upstart +endif LIBVIRT_INIT_SCRIPT_UPSTART =20 =20 EXTRA_DIST +=3D dtrace2systemtap.pl @@ -1003,17 +995,15 @@ libvirt_nss_la_LIBADD =3D \ endif WITH_NSS =20 =20 -install-data-local: install-init install-systemd install-upstart \ - install-sysctl install-polkit install-sasl \ - install-logrotate $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) +install-data-local: $(INSTALL_DATA_LOCAL) \ + $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/images" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" $(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot" =20 -uninstall-local:: uninstall-init uninstall-systemd uninstall-upstart \ - uninstall-sysctl uninstall-polkit uninstall-sasl \ - uninstall-logrotate $(INSTALL_DATA_DIRS:%=3Duninstall-data-%) +uninstall-local:: $(UNINSTALL_LOCAL) \ + $(INSTALL_DATA_DIRS:%=3Duninstall-data-%) rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||: rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems" ||: diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 5ef082c595..4a415d4482 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -203,10 +203,10 @@ install-sysctl: uninstall-sysctl: rm -f $(DESTDIR)$(sysctldir)/60-libvirtd.conf rmdir $(DESTDIR)$(sysctldir) || : -else ! WITH_SYSCTL -install-sysctl: -uninstall-sysctl: -endif ! WITH_SYSCTL + +INSTALL_DATA_LOCAL +=3D install-sysctl +UNINSTALL_LOCAL +=3D uninstall-sysctl +endif WITH_SYSCTL =20 if WITH_POLKIT polkitactionsdir =3D $(datadir)/polkit-1/actions @@ -226,17 +226,11 @@ uninstall-polkit:: rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules rmdir $(DESTDIR)$(polkitrulesdir) || : =20 -else ! WITH_POLKIT -install-polkit:: -uninstall-polkit:: -endif ! WITH_POLKIT +INSTALL_DATA_LOCAL +=3D install-polkit +UNINSTALL_LOCAL +=3D uninstall-polkit +endif WITH_POLKIT =20 -else ! WITH_LIBVIRTD -install-polkit:: -uninstall-polkit:: -install-sysctl:: -uninstall-sysctl:: -endif ! WITH_LIBVIRTD +endif WITH_LIBVIRTD =20 .PHONY: \ install-data-remote \ @@ -257,10 +251,10 @@ install-sasl: uninstall-sasl: rm -f $(DESTDIR)$(sasldir)/libvirt.conf rmdir $(DESTDIR)$(sasldir) || : -else ! WITH_SASL -install-sasl: -uninstall-sasl: -endif ! WITH_SASL + +INSTALL_DATA_LOCAL +=3D install-sasl +UNINSTALL_LOCAL +=3D uninstall-sasl +endif WITH_SASL =20 libvirtd.init: remote/libvirtd.init.in $(top_builddir)/config.status $(AM_V_GEN)sed \ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list