From nobody Fri May 3 20:13:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1507288530554164.36910831955834; Fri, 6 Oct 2017 04:15:30 -0700 (PDT) Received: from localhost ([::1]:44150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e0Qb9-00041S-Cg for importer@patchew.org; Fri, 06 Oct 2017 07:15:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e0QZq-00037R-9i for qemu-devel@nongnu.org; Fri, 06 Oct 2017 07:13:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e0QZm-0000sZ-3y for qemu-devel@nongnu.org; Fri, 06 Oct 2017 07:13:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48638) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e0QZl-0000r6-Rh for qemu-devel@nongnu.org; Fri, 06 Oct 2017 07:13:54 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E41D27EA9B; Fri, 6 Oct 2017 11:13:51 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-239.ams2.redhat.com [10.36.116.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3E766250F; Fri, 6 Oct 2017 11:13:49 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C6C024055A; Fri, 6 Oct 2017 13:13:48 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E41D27EA9B Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=kraxel@redhat.com From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Fri, 6 Oct 2017 13:13:42 +0200 Message-Id: <20171006111342.6665-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 06 Oct 2017 11:13:52 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] keycodemapdb: try fix makefile deps X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" (1) make .git-submodule-status depend on config-host.mak, for GIT_SUBMODULES changes. (2) make $(KEYCODEMAP_{GEN,CSV}) depend on .git-submodule-status so make knows what to do if they are not there. I still get errors because make tries to generate the files before they are= checked out, but make seems to notice it has to start over and correctly generates the f= iles on the second attempt. [ ... ] GEN config-host.h GEN module_block.h GEN ui/input-keymap-linux-to-qcode.c GEN ui/input-keymap-qcode-to-qnum.c GEN ui/input-keymap-qnum-to-qcode.c python: can't open file '/home/kraxel/projects/qemu/ui/keycodemapdb/tools/k= eymap-gen': [Errno 2] No such file or directory python: can't open file '/home/kraxel/projects/qemu/ui/keycodemapdb/tools/k= eymap-gen': [Errno 2] No such file or directory python: can't open file '/home/kraxel/projects/qemu/ui/keycodemapdb/tools/k= eymap-gen': [Errno 2] No such file or directory make: Leaving directory `/home/kraxel/projects/qemu/build-default' make: Entering directory `/home/kraxel/projects/qemu/build-default' GIT ui/keycodemapdb GEN trace/generated-tcg-tracers.h GEN trace/generated-helpers-wrappers.h GEN trace/generated-helpers.h GEN trace/generated-helpers.c GEN ui/input-keymap-linux-to-qcode.c GEN ui/input-keymap-qcode-to-qnum.c GEN ui/input-keymap-qnum-to-qcode.c CC qga/main.o [ ... ] --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1d3b31f074..c97258629e 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ git-submodule-update: endif endif =20 -.git-submodule-status: git-submodule-update +.git-submodule-status: git-submodule-update config-host.mak =20 Makefile: .git-submodule-status =20 @@ -225,7 +225,7 @@ KEYCODEMAP_FILES =3D \ =20 GENERATED_FILES +=3D $(KEYCODEMAP_FILES) =20 -ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Ma= kefile.objs .git-submodule-status +ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV) $(SRC_PATH)/ui/Ma= kefile.objs $(call quiet-command,\ src=3D$$(echo $@ | sed -E -e "s,^ui/input-keymap-(.+)-to-(.+)\.c$$,\1= ,") && \ dst=3D$$(echo $@ | sed -E -e "s,^ui/input-keymap-(.+)-to-(.+)\.c$$,\2= ,") && \ @@ -235,6 +235,9 @@ ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV= ) $(SRC_PATH)/ui/Makefile code-map $(KEYCODEMAP_CSV) $${src} $${dst} \ > $@ || rm $@, "GEN", "$@") =20 +$(KEYCODEMAP_GEN): .git-submodule-status +$(KEYCODEMAP_CSV): .git-submodule-status + # Don't try to regenerate Makefile or configure # We don't generate any of them Makefile: ; --=20 2.9.3