Re: [Qemu-devel] [PATCH 3/3] Makefile: add dependency on scripts/hxtool

[Peter Maydell]

On 7 June 2016 at 12:48, Paolo Bonzini <address@hidden> wrote:
> Make sure that the various documentation and C code files are rebuilt
> whenever there is a change in the script that splits them out of
> .hx files.
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
>  Makefile        | 14 +++++++-------
>  Makefile.target |  6 +++---
>  2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 72e0d74..a27336d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -169,7 +169,7 @@ all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
>
>  config-host.h: config-host.h-timestamp
>  config-host.h-timestamp: config-host.mak $(SRC_PATH)/scripts/create_config
> -qemu-options.def: $(SRC_PATH)/qemu-options.hx
> +qemu-options.def: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  
> GEN   $@")
>
>  SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
> @@ -241,7 +241,7 @@ qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o 
> libqemuutil.a libqemustub.a
>  fsdev/virtfs-proxy-helper$(EXESUF): fsdev/virtfs-proxy-helper.o 
> fsdev/9p-marshal.o fsdev/9p-iov-marshal.o libqemuutil.a libqemustub.a
>  fsdev/virtfs-proxy-helper$(EXESUF): LIBS += -lcap
>
> -qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
> +qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  
> GEN   $@")
>
>  qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
> @@ -524,19 +524,19 @@ TEXIFLAG=$(if $(V),,--quiet)
>  %.pdf: %.texi
>         $(call quiet-command,texi2pdf $(TEXIFLAG) -I . $<,"  GEN   $@")
>
> -qemu-options.texi: $(SRC_PATH)/qemu-options.hx
> +qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  
> GEN   $@")
>
> -qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx
> +qemu-monitor.texi: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  
> GEN   $@")
>
> -qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx
> +qemu-monitor-info.texi: $(SRC_PATH)/hmp-commands-info.hx 
> $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  
> GEN   $@")
>
> -qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx
> +qmp-commands.txt: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -q < $< > $@,"  
> GEN   $@")
>
> -qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx
> +qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"  
> GEN   $@")
>
>  qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi 
> qemu-monitor-info.texi
> diff --git a/Makefile.target b/Makefile.target
> index 0bb5e78..a9646d6 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -206,13 +206,13 @@ endif
>  gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
>         $(call quiet-command,rm -f $@ && $(SHELL) 
> $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"  GEN   
> $(TARGET_DIR)$@")
>
> -hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
> +hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  
> GEN   $(TARGET_DIR)$@")
>
> -hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx
> +hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx 
> $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  
> GEN   $(TARGET_DIR)$@")
>
> -qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx
> +qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool
>         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  
> GEN   $(TARGET_DIR)$@")

Reviewed-by: Peter Maydell <address@hidden>

(looks like there's scope for cleaning this up with some pattern rules
later if we want to.)

thanks
-- PMM