From nobody Wed May 14 03:13:50 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 1530288177862757.1636046310427; Fri, 29 Jun 2018 09:02:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C280F307CF40; Fri, 29 Jun 2018 16:02:56 +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 6FB571001918; Fri, 29 Jun 2018 16:02:56 +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 DD7EB4A46E; Fri, 29 Jun 2018 16:02:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w5TG1axg010145 for ; Fri, 29 Jun 2018 12:01:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8AF7C2026D6A; Fri, 29 Jun 2018 16:01:36 +0000 (UTC) Received: from inaba.usersys.redhat.com (unknown [10.43.2.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2FF1E2026D68 for ; Fri, 29 Jun 2018 16:01:36 +0000 (UTC) From: Andrea Bolognani To: libvir-list@redhat.com Date: Fri, 29 Jun 2018 18:01:22 +0200 Message-Id: <20180629160122.19827-16-abologna@redhat.com> In-Reply-To: <20180629160122.19827-1-abologna@redhat.com> References: <20180629160122.19827-1-abologna@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 15/15] autotools: Use consistent style 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 29 Jun 2018 16:02:57 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Sticking to one item per line will ensure future diffs are minimal and easily understandable. More in general, being consistent is good :) Signed-off-by: Andrea Bolognani --- Makefile.am | 12 +++++++++--- data/Makefile.am | 32 +++++++++++++++++++++++--------- docs/Makefile.am | 16 ++++++++++++---- src/Makefile.am | 40 +++++++++++++++++++++++++++------------- tests/Makefile.am | 21 ++++++++++++++------- 5 files changed, 85 insertions(+), 36 deletions(-) diff --git a/Makefile.am b/Makefile.am index bb5ff5c..93941c6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,9 @@ - -SUBDIRS =3D data docs src tests +SUBDIRS =3D \ + data \ + docs \ + src \ + tests \ + $(NULL) =20 ACLOCAL_AMFLAGS =3D -I m4 =20 @@ -11,7 +15,9 @@ EXTRA_DIST =3D \ README.md \ $(NULL) =20 -DISTCLEAN_FILES =3D $(PACKAGE).spec +DISTCLEAN_FILES =3D \ + $(PACKAGE).spec \ + $(NULL) =20 rpm: clean @(unset CDPATH ; $(MAKE) dist && rpmbuild -ta $(distdir).tar.gz) diff --git a/data/Makefile.am b/data/Makefile.am index f1e9dfd..7b523da 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,22 +1,34 @@ service_in_files =3D \ - session/org.libvirt.service.in + session/org.libvirt.service.in \ + $(NULL) servicedir =3D $(DBUS_SERVICES_DIR) -service_DATA =3D $(service_in_files:.service.in=3D.service) +service_DATA =3D \ + $(service_in_files:.service.in=3D.service) \ + $(NULL) =20 system_service_in_files =3D \ - system/org.libvirt.service.in + system/org.libvirt.service.in \ + $(NULL) system_servicedir =3D $(DBUS_SYSTEM_SERVICES_DIR) -system_service_DATA =3D $(system_service_in_files:.service.in=3D.service) +system_service_DATA =3D \ + $(system_service_in_files:.service.in=3D.service) \ + $(NULL) =20 system_policy_in_files =3D \ - system/org.libvirt.conf.in + system/org.libvirt.conf.in \ + $(NULL) system_policydir =3D $(DBUS_SYSTEM_POLICIES_DIR) -system_policy_DATA =3D $(system_policy_in_files:.conf.in=3D.conf) +system_policy_DATA =3D \ + $(system_policy_in_files:.conf.in=3D.conf) \ + $(NULL) =20 polkit_in_files =3D \ - system/libvirt-dbus.rules.in + system/libvirt-dbus.rules.in \ + $(NULL) polkitdir =3D $(POLKIT_RULES_DIR) -polkit_DATA =3D $(polkit_in_files:.rules.in=3D.rules) +polkit_DATA =3D \ + $(polkit_in_files:.rules.in=3D.rules) \ + $(NULL) =20 interfaces_files =3D \ org.libvirt.Connect.xml \ @@ -29,7 +41,9 @@ interfaces_files =3D \ org.libvirt.StorageVol.xml \ $(NULL) interfacesdir =3D $(DBUS_INTERFACES_DIR) -interfaces_DATA =3D $(interfaces_files) +interfaces_DATA =3D \ + $(interfaces_files) \ + $(NULL) =20 EXTRA_DIST =3D \ $(service_in_files) \ diff --git a/docs/Makefile.am b/docs/Makefile.am index c41ffae..fe8ca1c 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,13 +1,21 @@ POD2MAN =3D pod2man -c "Virtualization Support" -r "$(PACKAGE)-$(VERSION)" =20 -PODFILES =3D libvirt-dbus.pod +PODFILES =3D \ + libvirt-dbus.pod \ + $(NULL) =20 %.8: %.pod $(AM_V_GEN)$(POD2MAN) -s 8 $< $@ \ && if grep 'POD ERROR' $@; then rm $@; exit 1; fi =20 -man8_MANS =3D libvirt-dbus.8 +man8_MANS =3D \ + libvirt-dbus.8 \ + $(NULL) =20 -EXTRA_DIST =3D $(PODFILES) +EXTRA_DIST =3D \ + $(PODFILES) \ + $(NULL) =20 -CLEANFILES =3D $(man8_MANS) +CLEANFILES =3D \ + $(man8_MANS) \ + $(NULL) diff --git a/src/Makefile.am b/src/Makefile.am index 493cf81..2fb1820 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,7 @@ AM_CPPFLAGS =3D \ -I$(top_srcdir)/src \ - -DVIRT_DBUS_INTERFACES_DIR=3D\"$(DBUS_INTERFACES_DIR)\" + -DVIRT_DBUS_INTERFACES_DIR=3D\"$(DBUS_INTERFACES_DIR)\" \ + $(NULL) AM_CFLAGS =3D \ $(GIO2_CFLAGS) \ $(GLIB2_CFLAGS) \ @@ -27,24 +28,37 @@ libutil_la_SOURCES =3D \ util.h \ $(NULL) =20 -bin_PROGRAMS =3D libvirt-dbus +bin_PROGRAMS =3D \ + libvirt-dbus \ + $(NULL) =20 libvirt_dbus_SOURCES =3D \ + connect.c \ + connect.h \ + domain.c \ + domain.h \ + events.c \ + events.h \ + gdbus.c \ + gdbus.h \ main.c \ - connect.c connect.h \ - domain.c domain.h \ - events.c events.h \ - gdbus.c gdbus.h \ - network.c network.h \ - nodedev.c nodedev.h \ - nwfilter.c nwfilter.h \ - secret.c secret.h \ - storagepool.c storagepool.h \ - storagevol.c storagevol.h \ + network.c \ + network.h \ + nodedev.c \ + nodedev.h \ + nwfilter.c \ + nwfilter.h \ + secret.c \ + secret.h \ + storagepool.c \ + storagepool.h \ + storagevol.c \ + storagevol.h \ $(NULL) libvirt_dbus_LDADD =3D \ libutil.la \ $(GIO2_LIBS) \ $(GLIB2_LIBS) \ $(LIBVIRT_LIBS) \ - $(LIBVIRT_GLIB_LIBS) + $(LIBVIRT_GLIB_LIBS) \ + $(NULL) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2991689..09c3e2e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -5,17 +5,20 @@ AM_CPPFLAGS =3D \ test_helpers =3D \ xmldata.py \ libvirttest.py \ - conftest.py + conftest.py \ + $(NULL) =20 test_programs =3D \ test_connect.py \ test_domain.py \ test_network.py \ test_nodedev.py \ - test_storage.py + test_storage.py \ + $(NULL) =20 check_PROGRAMS =3D \ - test_util + test_util \ + $(NULL) =20 test_util_SOURCES =3D \ test_util.c \ @@ -23,21 +26,25 @@ test_util_SOURCES =3D \ test_util_CFLAGS =3D \ $(GIO2_CFLAGS) \ $(GLIB2_CFLAGS) \ - $(LIBVIRT_CFLAGS) + $(LIBVIRT_CFLAGS) \ + $(NULL) test_util_LDFLAGS =3D \ $(GIO2_LDFLAGS) \ $(GLIB2_LDFLAGS) \ - $(LIBVIRT_LDFLAGS) + $(LIBVIRT_LDFLAGS) \ + $(NULL) test_util_LDADD =3D \ $(top_builddir)/src/libutil.la \ $(GIO2_LIBS) \ $(GLIB2_LIBS) \ - $(LIBVIRT_LIBS) + $(LIBVIRT_LIBS) \ + $(NULL) =20 EXTRA_DIST =3D \ $(test_helpers) \ $(test_programs) \ - travis-run + travis-run \ + $(NULL) =20 TESTS =3D \ $(check_PROGRAMS) \ --=20 2.17.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list