diff mbox

trace: fix trace-events-all dependencies in Makefile.objs

Message ID 20170213092709.24711-1-lma@suse.com
State New
Headers show

Commit Message

Lin Ma Feb. 13, 2017, 9:27 a.m. UTC
It causes that file trace-events-all isn't generated during build, make
install reports 'No such file or directory'. The patch fixes it.

Signed-off-by: Lin Ma <lma@suse.com>
---
 trace/Makefile.objs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Daniel P. Berrangé Feb. 13, 2017, 9:38 a.m. UTC | #1
On Mon, Feb 13, 2017 at 05:27:09PM +0800, Lin Ma wrote:
> It causes that file trace-events-all isn't generated during build, make
> install reports 'No such file or directory'. The patch fixes it.
> 
> Signed-off-by: Lin Ma <lma@suse.com>
> ---
>  trace/Makefile.objs | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/trace/Makefile.objs b/trace/Makefile.objs
> index 7de840a..8e5e85a 100644
> --- a/trace/Makefile.objs
> +++ b/trace/Makefile.objs
> @@ -17,7 +17,7 @@ $(BUILD_DIR)/trace-events-all: $(trace-events-files)
>  
>  $(obj)/generated-helpers-wrappers.h: $(obj)/generated-helpers-wrappers.h-timestamp
>  	@cmp $< $@ >/dev/null 2>&1 || cp $< $@
> -$(obj)/generated-helpers-wrappers.h-timestamp: $(trace-events-files) $(BUILD_DIR)/config-host.mak $(tracetool-y)
> +$(obj)/generated-helpers-wrappers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)

This dependancy change is not right. The correct fix is here

  https://lists.gnu.org/archive/html/qemu-devel/2017-02/msg00959.html


Regards,
Daniel
Lin Ma Feb. 13, 2017, 10:08 a.m. UTC | #2
Yeah, I just noticed, Thank you.

>>> "Daniel P. Berrange" <berrange@redhat.com> 2017/2/13 星期一 下午 5:38 >>>
On Mon, Feb 13, 2017 at 05:27:09PM +0800, Lin Ma wrote:
> It causes that file trace-events-all isn't generated during build, make
> install reports 'No such file or directory'. The patch fixes it.
> 
> Signed-off-by: Lin Ma <lma@suse.com>
> ---
>  trace/Makefile.objs | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/trace/Makefile.objs b/trace/Makefile.objs
> index 7de840a..8e5e85a 100644
> --- a/trace/Makefile.objs
> +++ b/trace/Makefile.objs
> @@ -17,7 +17,7 @@ $(BUILD_DIR)/trace-events-all: $(trace-events-files)
>  
>  $(obj)/generated-helpers-wrappers.h: $(obj)/generated-helpers-wrappers.h-timestamp
> 	 @cmp $< $@ >/dev/null 2>&1 || cp $< $@
> -$(obj)/generated-helpers-wrappers.h-timestamp: $(trace-events-files) $(BUILD_DIR)/config-host.mak $(tracetool-y)
> +$(obj)/generated-helpers-wrappers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)

This dependancy change is not right. The correct fix is here

  https://lists.gnu.org/archive/html/qemu-devel/2017-02/msg00959.html


Regards,
Daniel
diff mbox

Patch

diff --git a/trace/Makefile.objs b/trace/Makefile.objs
index 7de840a..8e5e85a 100644
--- a/trace/Makefile.objs
+++ b/trace/Makefile.objs
@@ -17,7 +17,7 @@  $(BUILD_DIR)/trace-events-all: $(trace-events-files)
 
 $(obj)/generated-helpers-wrappers.h: $(obj)/generated-helpers-wrappers.h-timestamp
 	@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers-wrappers.h-timestamp: $(trace-events-files) $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-helpers-wrappers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
 	$(call quiet-command,$(TRACETOOL) \
 		--group=all \
 		--format=tcg-helper-wrapper-h \
@@ -26,7 +26,7 @@  $(obj)/generated-helpers-wrappers.h-timestamp: $(trace-events-files) $(BUILD_DIR
 
 $(obj)/generated-helpers.h: $(obj)/generated-helpers.h-timestamp
 	@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers.h-timestamp: $(trace-events-files) $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-helpers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
 	$(call quiet-command,$(TRACETOOL) \
 		--group=all \
 		--format=tcg-helper-h \
@@ -35,7 +35,7 @@  $(obj)/generated-helpers.h-timestamp: $(trace-events-files) $(BUILD_DIR)/config-
 
 $(obj)/generated-helpers.c: $(obj)/generated-helpers.c-timestamp
 	@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-helpers.c-timestamp: $(trace-events-files) $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-helpers.c-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
 	$(call quiet-command,$(TRACETOOL) \
 		--group=all \
 		--format=tcg-helper-c \
@@ -49,7 +49,7 @@  target-obj-y += generated-helpers.o
 
 $(obj)/generated-tcg-tracers.h: $(obj)/generated-tcg-tracers.h-timestamp
 	@cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(obj)/generated-tcg-tracers.h-timestamp: $(trace-events-files) $(BUILD_DIR)/config-host.mak $(tracetool-y)
+$(obj)/generated-tcg-tracers.h-timestamp: $(BUILD_DIR)/trace-events-all $(BUILD_DIR)/config-host.mak $(tracetool-y)
 	$(call quiet-command,$(TRACETOOL) \
 		--group=all \
 		--format=tcg-h \