From nobody Sun Feb 8 23:06:04 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571917899; cv=none; d=zoho.com; s=zohoarc; b=S8KkUYoXweyy8+LVg2bchBcstIT7BXgfMshTmy3uo1JO4xEMSuuS9hR7B111Rkp6o8JPCJojSb38wBt4zOIBZiUvuKlR+FNdG1djYaU+hfpL6Wb0HZjpFH/nm+8MBUXCvHzrAey1Se4SlCXB63rmhtq9qifzk9sjq/r7ZPkB7mI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571917899; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=w44qSW0UnYH1X45xDpiepexPtOIkJwZmhxKDHWIC+pQ=; b=F5U08o0Oh2otavr0y4OsBmFeXx5jEjvzuMfS4jw0VYrUaIiTz1TKVhuVmZ+6oP4rxVuzWB9ZejQ8iobJHYQw/0+OhLt2I23qqIew+HXmhgNh+pO+k1xLLupRGXBggEg7kkagGZrxm0v2TRXP5K+u65uiddLLT7waWdt3De7Xbjs= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1571917899196845.491052986504; Thu, 24 Oct 2019 04:51:39 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-82-XyR9GnA8PPiKYtWSiywHJw-1; Thu, 24 Oct 2019 07:51:35 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id E621B800D5B; Thu, 24 Oct 2019 11:51:29 +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 B9BA361F21; Thu, 24 Oct 2019 11:51:29 +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 76F20180BA9C; Thu, 24 Oct 2019 11:51:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9OBpCHa032369 for ; Thu, 24 Oct 2019 07:51:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id A493A60161; Thu, 24 Oct 2019 11:51:12 +0000 (UTC) Received: from antique-laptop.redhat.com (ovpn-200-50.brq.redhat.com [10.40.200.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A7B0600CC for ; Thu, 24 Oct 2019 11:51:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571917898; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=w44qSW0UnYH1X45xDpiepexPtOIkJwZmhxKDHWIC+pQ=; b=KJbPwsy5nPhnXg1ajMyFRizsKmLfbJ3sJYasdrW2R2HPcKUk6KsrOnuWICffwGYAyQtWJM ALtsBztYb2qGMZohfH7StUNlU4IAcVpF5ZymQ8GvsT/76tuVVUiKPUAMlS0UCNUuKv8f+K HM41YR2yW48aB54CJd9adV9egpQ3CBE= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 24 Oct 2019 13:50:46 +0200 Message-Id: <4a0982dc44365fa5c05c4fe34a17fc468cde3b52.1571917791.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v2 04/20] syntax-check.mk: cleanup sc_po_check dependencies 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: , 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-MC-Unique: XyR9GnA8PPiKYtWSiywHJw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Introduce new rule 'generated-sources' as a helper for PO files check to make sure that all generated files are prepared and to not duplicate the list on different places. This will be used as a dependency for sc_po_check rule instead of duplicated list of generated files. Signed-off-by: Pavel Hrdina --- Notes: New in v2. build-aux/syntax-check.mk | 25 ++++++------------------- src/Makefile.am | 3 +++ 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index 5890f4737f..6acda4eea3 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -1953,6 +1953,9 @@ sc_m4_quote_check: halt=3D'quote the first arg to AC_DEF*' \ $(_sc_search_regexp) =20 +gen_source_files: + $(MAKE) -C src generated-sources + fix_po_file_diag =3D \ 'you have changed the set of files with translatable diagnostics;\n\ apply the above patch\n' @@ -1977,7 +1980,9 @@ perl_translatable_files_list_ =3D \ po_file ?=3D $(srcdir)/po/POTFILES generated_files ?=3D $(srcdir)/lib/*.[ch] _gl_translatable_string_re ?=3D \b(N?_|gettext *)\([^)"]*("|$$) -sc_po_check: + +# sc_po_check can fail if generated files are not built first +sc_po_check: gen_source_files @if test -f $(po_file); then \ $(GREP) -E -v '^(#|$$)' $(po_file) \ | $(GREP) -v '^src/false\.c$$' | sort > $@-1; \ @@ -2160,24 +2165,6 @@ test-wrap-argv: group-qemu-caps: $(AM_V_GEN)$(PERL) $(top_srcdir)/tests/group-qemu-caps.pl --check $(top_s= rcdir)/ =20 -# sc_po_check can fail if generated files are not built first -sc_po_check: \ - $(srcdir)/src/remote/remote_daemon_dispatch_stubs.h \ - $(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h \ - $(srcdir)/src/remote/remote_client_bodies.h \ - $(srcdir)/src/admin/admin_server_dispatch_stubs.h \ - $(srcdir)/src/admin/admin_client.h -$(srcdir)/src/remote/remote_daemon_dispatch_stubs.h: $(srcdir)/src/remote/= remote_protocol.x - $(MAKE) -C src remote/remote_daemon_dispatch_stubs.h -$(srcdir)/src/remote/remote_daemon_dispatch_qemu_stubs.h: $(srcdir)/src/re= mote/qemu_protocol.x - $(MAKE) -C src remote/remote_daemon_dispatch_qemu_stubs.h -$(srcdir)/src/remote/remote_client_bodies.h: $(srcdir)/src/remote/remote_p= rotocol.x - $(MAKE) -C src remote/remote_client_bodies.h -$(srcdir)/src/admin/admin_server_dispatch_stubs.h: $(srcdir)/src/admin/adm= in_protocol.x - $(MAKE) -C src admin/admin_server_dispatch_stubs.h -$(srcdir)/src/admin/admin_client.h: $(srcdir)/src/admin/admin_protocol.x - $(MAKE) -C src admin/admin_client.h - # List all syntax-check exemptions: exclude_file_name_regexp--sc_avoid_strcase =3D ^tools/vsh\.h$$ =20 diff --git a/src/Makefile.am b/src/Makefile.am index ebc24610e2..e0b917fcdd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -717,6 +717,9 @@ libvirt_iohelper_CFLAGS =3D \ endif WITH_LIBVIRTD =20 =20 +generated-sources: $(BUILT_SOURCES) + + install-data-local: $(INSTALL_DATA_LOCAL) \ $(INSTALL_DATA_DIRS:%=3Dinstall-data-%) $(MKDIR_P) "$(DESTDIR)$(localstatedir)/cache/libvirt" --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list