From nobody Tue Feb 10 00:57:38 2026 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 1489648075314701.5875474042272; Thu, 16 Mar 2017 00:07:55 -0700 (PDT) Received: from localhost ([::1]:41327 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coPVq-0003vu-3c for importer@patchew.org; Thu, 16 Mar 2017 03:07:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38449) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coPSk-0001uh-Do for qemu-devel@nongnu.org; Thu, 16 Mar 2017 03:04:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coPSj-0005zi-9X for qemu-devel@nongnu.org; Thu, 16 Mar 2017 03:04:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60584) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coPSj-0005zc-0m for qemu-devel@nongnu.org; Thu, 16 Mar 2017 03:04:41 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0B26861E4C; Thu, 16 Mar 2017 07:04:41 +0000 (UTC) Received: from localhost (ovpn-116-32.ams2.redhat.com [10.36.116.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3BCFE5C3FA; Thu, 16 Mar 2017 07:04:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 0B26861E4C Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 0B26861E4C From: Stefan Hajnoczi To: Date: Thu, 16 Mar 2017 15:04:25 +0800 Message-Id: <20170316070427.17120-2-stefanha@redhat.com> In-Reply-To: <20170316070427.17120-1-stefanha@redhat.com> References: <20170316070427.17120-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 16 Mar 2017 07:04:41 +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] [PULL 1/3] 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: Peter Maydell , 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" From: "Daniel P. Berrange" 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 Message-id: 20170228122901.24520-2-berrange@redhat.com Signed-off-by: Stefan Hajnoczi --- 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 346345e..479dcd9 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -482,7 +482,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