aboutsummaryrefslogtreecommitdiff
path: root/qga
diff options
context:
space:
mode:
authorDunrong Huang <riegamaths@gmail.com>2012-07-29 03:11:24 +0800
committerBlue Swirl <blauwirbel@gmail.com>2012-07-29 08:41:53 +0000
commit54c2e50205711a4dc5134d07079174e3e8be10a7 (patch)
treef3ff49aafee3c4a72eaa734bf3fe7a01f349a6ac /qga
parentb595c14a7bd3d4d47a44d064d7efbaaf45b4321b (diff)
downloadqemu-54c2e50205711a4dc5134d07079174e3e8be10a7.zip
qemu-54c2e50205711a4dc5134d07079174e3e8be10a7.tar.gz
qemu-54c2e50205711a4dc5134d07079174e3e8be10a7.tar.bz2
build: Fix linking failure for qemu-ga
This patch will fix the following linking failed: LINK qemu-ga gcc: error: qga/../qapi-generated/qga-qapi-types.o: No such file or directory gcc: error: qga/../qapi-generated/qga-qapi-visit.o: No such file or directory gcc: error: qga/../qapi-generated/qga-qmp-marshal.o: No such file or directory make: *** [qemu-ga] Error 1 Commit cdc976b040f2760103ce2fb49f4d504093a7163f changes the dependencies of qemu-ga to depend "../qapi-generated/qga-qapi-types.o", which will be expanded to "qga/../qapi-generated/qga-qapi-types.o" when building qemu-ga. In top-level Makefile, we defined a target "qapi-generated/qga-qapi-types.o" which was not equal to "qga/../qapi-generated/qga-qapi-types" in the Makefile world. So "No such file" error happened when qemu-ga was linking. The easy approach to fix is to change the target name to "qga/../qapi-generated/qga-qapi-types.o", but it is weird. So, in order to solve it more graciously, I move those temporary files(qga-qapi-*.{c,h}) qemu-ga depends on to qemu-ga/qapi-generated, this makes dependencies more clearer. Signed-off-by: Dunrong Huang <riegamaths@gmail.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'qga')
-rw-r--r--qga/Makefile.objs4
1 files changed, 2 insertions, 2 deletions
diff --git a/qga/Makefile.objs b/qga/Makefile.objs
index b54b9b1..cd3e135 100644
--- a/qga/Makefile.objs
+++ b/qga/Makefile.objs
@@ -1,5 +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
+qga-obj-y += qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-visit.o
+qga-obj-y += qapi-generated/qga-qmp-marshal.o