From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:36670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goJX6-0004yJ-IP for qemu-devel@nongnu.org; Mon, 28 Jan 2019 21:53:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goJX5-0007FT-DJ for qemu-devel@nongnu.org; Mon, 28 Jan 2019 21:53:52 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34706) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1goJX5-0007En-4v for qemu-devel@nongnu.org; Mon, 28 Jan 2019 21:53:51 -0500 From: Stefan Hajnoczi Date: Tue, 29 Jan 2019 10:53:43 +0800 Message-Id: <20190129025343.4788-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH] trace: rerun tracetool after ./configure changes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Christophe Lyon , Daniel Berrange , Peter Maydell , Stefan Hajnoczi Autogenerated code in trace.h/trace.c and friends is specific to the config-host.mak TRACE_BACKENDS setting and must be regenerated when ./configure --enable-trace-backend=3D changes settings. This patch ensures that changes to TRACE_BACKENDS are detected. For example, the trace-root.h file is now updated after switching trace backends: $ ./configure && make $ cp trace-root.h /tmp/old-trace-root.h $ ./configure --enable-trace-backend=3Dsimple && make $ diff -u /tmp/old-trace-root.h trace-root.h Reported-by: Christophe Lyon Signed-off-by: Stefan Hajnoczi --- Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index de898eab62..4e70cebc6a 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ tracetool-y +=3D $(shell find $(SRC_PATH)/scripts/tra= cetool -name "*.py") =20 %/trace.h: %/trace.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -%/trace.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) +%/trace.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUILD_D= IR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --group=3D$(call trace-group-name,$@) \ --format=3Dh \ @@ -154,7 +154,7 @@ tracetool-y +=3D $(shell find $(SRC_PATH)/scripts/tra= cetool -name "*.py") =20 %/trace.c: %/trace.c-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -%/trace.c-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) +%/trace.c-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUILD_D= IR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --group=3D$(call trace-group-name,$@) \ --format=3Dc \ @@ -163,7 +163,7 @@ tracetool-y +=3D $(shell find $(SRC_PATH)/scripts/tra= cetool -name "*.py") =20 %/trace-ust.h: %/trace-ust.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -%/trace-ust.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) +%/trace-ust.h-timestamp: $(SRC_PATH)/%/trace-events $(tracetool-y) $(BUI= LD_DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --group=3D$(call trace-group-name,$@) \ --format=3Dust-events-h \ @@ -187,7 +187,7 @@ tracetool-y +=3D $(shell find $(SRC_PATH)/scripts/tra= cetool -name "*.py") =20 trace-root.h: trace-root.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) +trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_= DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --group=3Droot \ --format=3Dh \ @@ -196,7 +196,7 @@ trace-root.h-timestamp: $(SRC_PATH)/trace-events $(tr= acetool-y) =20 trace-root.c: trace-root.c-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) +trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BUILD_= DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --group=3Droot \ --format=3Dc \ @@ -205,7 +205,7 @@ trace-root.c-timestamp: $(SRC_PATH)/trace-events $(tr= acetool-y) =20 trace-ust-root.h: trace-ust-root.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-ust-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) +trace-ust-root.h-timestamp: $(SRC_PATH)/trace-events $(tracetool-y) $(BU= ILD_DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --group=3Droot \ --format=3Dust-events-h \ @@ -214,7 +214,7 @@ trace-ust-root.h-timestamp: $(SRC_PATH)/trace-events = $(tracetool-y) =20 trace-ust-all.h: trace-ust-all.h-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-ust-all.h-timestamp: $(trace-events-files) $(tracetool-y) +trace-ust-all.h-timestamp: $(trace-events-files) $(tracetool-y) $(BUILD_= DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --group=3Dall \ --format=3Dust-events-h \ @@ -223,7 +223,7 @@ trace-ust-all.h-timestamp: $(trace-events-files) $(tr= acetool-y) =20 trace-ust-all.c: trace-ust-all.c-timestamp @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -trace-ust-all.c-timestamp: $(trace-events-files) $(tracetool-y) +trace-ust-all.c-timestamp: $(trace-events-files) $(tracetool-y) $(BUILD_= DIR)/config-host.mak $(call quiet-command,$(TRACETOOL) \ --group=3Dall \ --format=3Dust-events-c \ --=20 2.20.1