The Saturday 07 Jun 2014 à 21:12:04 (+0200), Max Reitz wrote : > qapi-schema.json has been split into three smaller JSON files in qapi/. > Add them as dependencies for the code generation in the Makefile, so > changes to them will result in a rebuilt of all QAPI-dependent code. > > Signed-off-by: Max Reitz <mre...@redhat.com> > --- > Makefile | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > index d830483..7837865 100644 > --- a/Makefile > +++ b/Makefile > @@ -246,18 +246,21 @@ $(SRC_PATH)/qga/qapi-schema.json > $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) > $(gen-out-type) -o qga/qapi-generated -p "qga-" -i $<, \ > " GEN $@") > > +qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \ > + $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json > + > qapi-types.c qapi-types.h :\ > -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) > +$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) > $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py \ > $(gen-out-type) -o "." -b -i $<, \ > " GEN $@") > qapi-visit.c qapi-visit.h :\ > -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) > +$(qapi-modules) $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) > $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py \ > $(gen-out-type) -o "." -b -i $<, \ > " GEN $@") > qmp-commands.h qmp-marshal.c :\ > -$(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) > +$(qapi-modules) $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) > $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py \ > $(gen-out-type) -o "." -m -i $<, \ > " GEN $@") > -- > 2.0.0 >
Seems correct. Thanks for fixing this. Reviewed-by: Benoit Canet <ben...@irqsave.net>
