From cdc976b040f2760103ce2fb49f4d504093a7163f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 11 Jul 2012 16:40:20 +0200 Subject: [PATCH] build: include qapi-generated/ files in qga/Makefile.objs No reason to leave them out, and it will ensure that the dependencies are picked up. Later we can perhaps move the files to another directory to avoid ../ usage. Signed-off-by: Paolo Bonzini Reviewed-by: Michael Roth Signed-off-by: Blue Swirl --- Makefile | 2 +- qga/Makefile.objs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ab82ef3dcb..a20050346a 100644 --- a/Makefile +++ b/Makefile @@ -206,7 +206,7 @@ QGALIB_GEN=$(addprefix qapi-generated/, qga-qapi-types.h qga-qapi-visit.h qga-qm $(QGALIB_OBJ): $(QGALIB_GEN) $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) -qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) $(QGALIB_OBJ) +qemu-ga$(EXESUF): qemu-ga.o $(qga-obj-y) $(tools-obj-y) $(qapi-obj-y) $(qobject-obj-y) $(version-obj-y) QEMULIBS=libhw32 libhw64 libuser libdis libdis-user diff --git a/qga/Makefile.objs b/qga/Makefile.objs index 6a4d843436..b54b9b12f0 100644 --- a/qga/Makefile.objs +++ b/qga/Makefile.objs @@ -1,3 +1,5 @@ qga-obj-y = commands.o guest-agent-command-state.o qga-obj-$(CONFIG_POSIX) += commands-posix.o channel-posix.o qga-obj-$(CONFIG_WIN32) += commands-win32.o channel-win32.o service-win32.o +qga-obj-y += ../qapi-generated/qga-qapi-types.o ../qapi-generated/qga-qapi-visit.o +qga-obj-y += ../qapi-generated/qga-qmp-marshal.o