On Fri, May 10, 2013 at 10:10:03AM -0400, Luiz Capitulino wrote: > On Thu, 9 May 2013 21:20:56 -0500 > Michael Roth <[email protected]> wrote: > > > Also, fix a dependency issue with libqemuutil: qemu-sockets.c needs > > qapi-types.c/qapi-visit.c > > > > Signed-off-by: Michael Roth <[email protected]> > > --- > > Makefile | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/Makefile b/Makefile > > index 7dc0204..9695c9d 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -178,7 +178,7 @@ Makefile: $(version-obj-y) $(version-lobj-y) > > # Build libraries > > > > libqemustub.a: $(stub-obj-y) > > -libqemuutil.a: $(util-obj-y) > > +libqemuutil.a: $(util-obj-y) qapi-types.o qapi-visit.o > > Don't we want this in for 1.5? >
I don't think it's causing any issues currently since it's not causing undefined reference errors upstream. users of libqemuutil that make use of qemu-sockets seem to be pulling qapi-types/qapi-visit in through other dependencies. I only noticed it because I was attempting to generate the native list code via tests/Makefile and running into redefinition conflicts with qapi-types.o/qapi-visit.o, then noticed the qemu-sockets.o issue when I attempted to remove the qapi-types/qapi-visit dependency from tests/test-visitor-serialization Now that we're generating the native list code from top-level Makefile, it actually doesn't seem to be needed by this series anymore, so maybe I'll pull it out for now. I think a better fix would be to have qapi/Makefile.obj add these to $util-obj-y directly anyway. > > > > ###################################################################### > > > > @@ -215,10 +215,10 @@ $(SRC_PATH)/qga/qapi-schema.json > > $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) > > > > qapi-types.c qapi-types.h :\ > > $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-types.py $(qapi-py) > > - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py > > $(gen-out-type) -o "." < $<, " GEN $@") > > + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py > > $(gen-out-type) -o "." -b < $<, " GEN $@") > > qapi-visit.c qapi-visit.h :\ > > $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-visit.py $(qapi-py) > > - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py > > $(gen-out-type) -o "." < $<, " GEN $@") > > + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py > > $(gen-out-type) -o "." -b < $<, " GEN $@") > > qmp-commands.h qmp-marshal.c :\ > > $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py > > $(qapi-py) > > $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py > > $(gen-out-type) -m -o "." < $<, " GEN $@") >
