From nobody Sun Apr 28 13:33:31 2024 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 1524221376015376.47896021963436; Fri, 20 Apr 2018 03:49:36 -0700 (PDT) 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 600753002A7D; Fri, 20 Apr 2018 10:49:34 +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 B93D75D70A; Fri, 20 Apr 2018 10:49:33 +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 AFB98B3487; Fri, 20 Apr 2018 10:49:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3KAnUFS028576 for ; Fri, 20 Apr 2018 06:49:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E6F52156619; Fri, 20 Apr 2018 10:49:30 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEBE12156617; Fri, 20 Apr 2018 10:49:29 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Fri, 20 Apr 2018 11:49:26 +0100 Message-Id: <20180420104926.4146-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] remote: always build generated source files 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.47]); Fri, 20 Apr 2018 10:49:35 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 The generated source files for dispatching libvirtd RPC messages contain translations and are thus listed in POTFILES. This means they are required in order to build libvirt.pot. Rather than changing the files that go into libvirt.pot dynamically, just unconditionally build the remote driver sources so they are always available for building libvirt.pot. This ensures we don't silently loose translation messages based on configure args. This fixes the mingw build which needs to create libvirt.pot but has libvirtd disabled. Signed-off-by: Daniel P. Berrang=C3=A9 --- Pushed to fix mingw build src/remote/Makefile.inc.am | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am index 12600b8bb5..eb8d6feb31 100644 --- a/src/remote/Makefile.inc.am +++ b/src/remote/Makefile.inc.am @@ -81,6 +81,17 @@ EXTRA_DIST +=3D \ remote/libvirtd.sysctl \ $(NULL) =20 +# Needed to build libvirt.pot, so must be listed outside +# the WITH_REMOTE/WITH_LIBVIRTD conditionals +BUILT_SOURCES +=3D \ + $(REMOTE_DRIVER_GENERATED) \ + $(LIBVIRTD_GENERATED) \ + $(NULL) +MAINTAINERCLEANFILES +=3D \ + $(REMOTE_DRIVER_GENERATED) \ + $(LIBVIRTD_GENERATED) \ + $(NULL) + if WITH_REMOTE noinst_LTLIBRARIES +=3D libvirt_driver_remote.la libvirt_la_BUILT_LIBADD +=3D libvirt_driver_remote.la @@ -93,9 +104,6 @@ libvirt_driver_remote_la_CFLAGS =3D \ libvirt_driver_remote_la_LDFLAGS =3D $(AM_LDFLAGS) libvirt_driver_remote_la_SOURCES =3D $(REMOTE_DRIVER_SOURCES) =20 -BUILT_SOURCES +=3D $(REMOTE_DRIVER_GENERATED) -MAINTAINERCLEANFILES +=3D $(REMOTE_DRIVER_GENERATED) - endif WITH_REMOTE =20 if WITH_REMOTE @@ -108,9 +116,6 @@ if WITH_LIBVIRTD =20 sbin_PROGRAMS +=3D libvirtd =20 -BUILT_SOURCES +=3D $(LIBVIRTD_GENERATED) -MAINTAINERCLEANFILES +=3D $(LIBVIRTD_GENERATED) - augeas_DATA +=3D remote/libvirtd.aug =20 augeastest_DATA +=3D test_libvirtd.aug --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list