From nobody Sat Apr 27 09:55:15 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.zoho.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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488285045108297.1810519011542; Tue, 28 Feb 2017 04:30:45 -0800 (PST) Received: from localhost ([::1]:60654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cigvT-0003Kq-KO for importer@patchew.org; Tue, 28 Feb 2017 07:30:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cigtz-0002TU-QT for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:29:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cigtx-0004RY-T4 for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:29:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38088) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cigtx-0004RF-KZ for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:29:09 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CC37180477; Tue, 28 Feb 2017 12:29:09 +0000 (UTC) Received: from dhcp-17-113.lcy.redhat.com (unknown [10.42.17.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC2D315A80; Tue, 28 Feb 2017 12:29:08 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 28 Feb 2017 12:29:00 +0000 Message-Id: <20170228122901.24520-2-berrange@redhat.com> In-Reply-To: <20170228122901.24520-1-berrange@redhat.com> References: <20170228122901.24520-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 28 Feb 2017 12:29:09 +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 1/2] makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Markus Armbruster , Stefan Hajnoczi 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" The only functional difference between the GENERATED_HEADERS and GENERATED_SOURCES variables is that 'Makefile' has a dependancy on GENERATED_HEADERS, causing generated header files to be created immediatey at the start of the build process. There is no reason why this early creation should be restricted to the .h files, and not include .c files too. Merge both of the variables into a single GENERATED_FILES variable to make it clear it is for any type of generated file. Signed-off-by: Daniel P. Berrange Reviewed-by: Fam Zheng --- Makefile | 35 +++++++++++++++++------------------ Makefile.target | 6 +++--- target/s390x/Makefile.objs | 2 +- tests/Makefile.include | 2 +- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 1c4c04f..a8024c0 100644 --- a/Makefile +++ b/Makefile @@ -50,24 +50,24 @@ endif =20 include $(SRC_PATH)/rules.mak =20 -GENERATED_HEADERS =3D qemu-version.h config-host.h qemu-options.def -GENERATED_HEADERS +=3D qmp-commands.h qapi-types.h qapi-visit.h qapi-event= .h -GENERATED_SOURCES +=3D qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c -GENERATED_HEADERS +=3D qmp-introspect.h -GENERATED_SOURCES +=3D qmp-introspect.c +GENERATED_FILES =3D qemu-version.h config-host.h qemu-options.def +GENERATED_FILES +=3D qmp-commands.h qapi-types.h qapi-visit.h qapi-event.h +GENERATED_FILES +=3D qmp-marshal.c qapi-types.c qapi-visit.c qapi-event.c +GENERATED_FILES +=3D qmp-introspect.h +GENERATED_FILES +=3D qmp-introspect.c =20 -GENERATED_HEADERS +=3D trace/generated-tcg-tracers.h +GENERATED_FILES +=3D trace/generated-tcg-tracers.h =20 -GENERATED_HEADERS +=3D trace/generated-helpers-wrappers.h -GENERATED_HEADERS +=3D trace/generated-helpers.h -GENERATED_SOURCES +=3D trace/generated-helpers.c +GENERATED_FILES +=3D trace/generated-helpers-wrappers.h +GENERATED_FILES +=3D trace/generated-helpers.h +GENERATED_FILES +=3D trace/generated-helpers.c =20 ifdef CONFIG_TRACE_UST -GENERATED_HEADERS +=3D trace-ust-all.h -GENERATED_SOURCES +=3D trace-ust-all.c +GENERATED_FILES +=3D trace-ust-all.h +GENERATED_FILES +=3D trace-ust-all.c endif =20 -GENERATED_HEADERS +=3D module_block.h +GENERATED_FILES +=3D module_block.h =20 TRACE_HEADERS =3D trace-root.h $(trace-events-subdirs:%=3D%/trace.h) TRACE_SOURCES =3D trace-root.c $(trace-events-subdirs:%=3D%/trace.c) @@ -80,8 +80,8 @@ ifdef CONFIG_TRACE_UST TRACE_HEADERS +=3D trace-ust-root.h $(trace-events-subdirs:%=3D%/trace-ust= .h) endif =20 -GENERATED_HEADERS +=3D $(TRACE_HEADERS) -GENERATED_SOURCES +=3D $(TRACE_SOURCES) +GENERATED_FILES +=3D $(TRACE_HEADERS) +GENERATED_FILES +=3D $(TRACE_SOURCES) =20 trace-group-name =3D $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g') =20 @@ -485,11 +485,10 @@ clean: rm -f fsdev/*.pod rm -f qemu-img-cmds.h rm -f ui/shader/*-vert.h ui/shader/*-frag.h - @# May not be present in GENERATED_HEADERS + @# May not be present in GENERATED_FILES rm -f trace/generated-tracers-dtrace.dtrace* rm -f trace/generated-tracers-dtrace.h* - rm -f $(foreach f,$(GENERATED_HEADERS),$(f) $(f)-timestamp) - rm -f $(foreach f,$(GENERATED_SOURCES),$(f) $(f)-timestamp) + rm -f $(foreach f,$(GENERATED_FILES),$(f) $(f)-timestamp) rm -rf qapi-generated rm -rf qga/qapi-generated for d in $(ALL_SUBDIRS); do \ @@ -784,7 +783,7 @@ endif # CONFIG_WIN # Add a dependency on the generated files, so that they are always # rebuilt before other object files ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOAL= S),,fail)) -Makefile: $(GENERATED_HEADERS) +Makefile: $(GENERATED_FILES) endif =20 .SECONDARY: $(TRACE_HEADERS) $(TRACE_HEADERS:%=3D%-timestamp) \ diff --git a/Makefile.target b/Makefile.target index 924304c..7df2b8c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -162,7 +162,7 @@ else obj-y +=3D hw/$(TARGET_BASE_ARCH)/ endif =20 -GENERATED_HEADERS +=3D hmp-commands.h hmp-commands-info.h +GENERATED_FILES +=3D hmp-commands.h hmp-commands-info.h =20 endif # CONFIG_SOFTMMU =20 @@ -238,5 +238,5 @@ ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DATA) $(QEMU_PROG)-simpletrace.stp "$(DESTDIR)$(qemu_datadir)/.= ./systemtap/tapset/$(QEMU_PROG)-simpletrace.stp" endif =20 -GENERATED_HEADERS +=3D config-target.h -Makefile: $(GENERATED_HEADERS) +GENERATED_FILES +=3D config-target.h +Makefile: $(GENERATED_FILES) diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs index c573633..46f6a8c 100644 --- a/target/s390x/Makefile.objs +++ b/target/s390x/Makefile.objs @@ -8,7 +8,7 @@ obj-$(CONFIG_KVM) +=3D kvm.o feat-src =3D $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/ feat-dst =3D $(BUILD_DIR)/$(TARGET_DIR) ifneq ($(MAKECMDGOALS),clean) -GENERATED_HEADERS +=3D $(feat-dst)gen-features.h +GENERATED_FILES +=3D $(feat-dst)gen-features.h endif =20 $(feat-dst)gen-features.h: $(feat-dst)gen-features.h-timestamp diff --git a/tests/Makefile.include b/tests/Makefile.include index e60bb6c..8cca626 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -478,7 +478,7 @@ qapi-schema +=3D unknown-expr-key.json =20 check-qapi-schema-y :=3D $(addprefix tests/qapi-schema/, $(qapi-schema)) =20 -GENERATED_HEADERS +=3D tests/test-qapi-types.h tests/test-qapi-visit.h \ +GENERATED_FILES +=3D tests/test-qapi-types.h tests/test-qapi-visit.h \ tests/test-qmp-commands.h tests/test-qapi-event.h \ tests/test-qmp-introspect.h =20 --=20 2.9.3 From nobody Sat Apr 27 09:55:15 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.zoho.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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1488285193284741.7661883843876; Tue, 28 Feb 2017 04:33:13 -0800 (PST) Received: from localhost ([::1]:60662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cigxp-0004wK-Tr for importer@patchew.org; Tue, 28 Feb 2017 07:33:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cigtz-0002TW-SU for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:29:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cigtz-0004S2-04 for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:29:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42902) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cigty-0004Rh-RJ for qemu-devel@nongnu.org; Tue, 28 Feb 2017 07:29:10 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E4AA64A4D; Tue, 28 Feb 2017 12:29:11 +0000 (UTC) Received: from dhcp-17-113.lcy.redhat.com (unknown [10.42.17.113]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10E1115A80; Tue, 28 Feb 2017 12:29:09 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 28 Feb 2017 12:29:01 +0000 Message-Id: <20170228122901.24520-3-berrange@redhat.com> In-Reply-To: <20170228122901.24520-1-berrange@redhat.com> References: <20170228122901.24520-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.74 on 10.5.11.28 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 28 Feb 2017 12:29:11 +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 2/2] makefile: generate trace-events-all upfront 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Markus Armbruster , Stefan Hajnoczi 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" Files should not be created in the build dir during the 'make install' phase. List 'trace-events-all' as a generated file so that it gets created upfront during build. Signed-off-by: Daniel P. Berrange Reviewed-by: Fam Zheng --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a8024c0..6291764 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,7 @@ endif =20 GENERATED_FILES +=3D $(TRACE_HEADERS) GENERATED_FILES +=3D $(TRACE_SOURCES) +GENERATED_FILES +=3D $(BUILD_DIR)/trace-events-all =20 trace-group-name =3D $(shell dirname $1 | sed -e 's/[^a-zA-Z0-9]/_/g') =20 @@ -592,8 +593,7 @@ endif endif =20 =20 -install: all $(if $(BUILD_DOCS),install-doc) $(BUILD_DIR)/trace-events-all= \ -install-datadir install-localstatedir +install: all $(if $(BUILD_DOCS),install-doc) install-datadir install-local= statedir ifneq ($(TOOLS),) $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)= $(bindir)) endif --=20 2.9.3