On 12/12/2011 05:03 PM, Anthony Liguori wrote:
On 12/07/2011 10:33 AM, Adam Litke wrote:
Currently the make variable qapi-dir refers to the qapi-generated
directory in
absolute terms. This causes the harmless but ugly make output below. By
changing this variable to the relative path the output conforms to the
norm and
the build works fine.
Before patch:
CC /home/aglitke/src/qemu/qapi-generated/qga-qapi-types.o
CC /home/aglitke/src/qemu/qapi-generated/qga-qapi-visit.o
CC /home/aglitke/src/qemu/qapi-generated/qga-qmp-marshal.o
After patch:
CC qapi-generated/qga-qapi-types.o
CC qapi-generated/qga-qapi-visit.o
CC qapi-generated/qga-qmp-marshal.o
This was supposedly to fix a build issue that I was never able to
reproduce. I think Luiz could reproduce it though. Luiz, could you try
out Adam's patch and confirm it breaks for you?
I think that was Stefano:
http://lists.gnu.org/archive/html/qemu-devel/2011-11/msg02752.html
Stefano had a patch that fixed a build breakage he saw with dirty
directories by setting:
qapi-dir := $(SRC_DIR)/qapi-generated
That patch ended up breaking the build for others, however, and was
reverted.
This patch was an improvement on the original, but we'd all agreed that
it wasn't necessary since we don't support working around issues related
to dirty directories.
So if it's ugly, we can safely drop it.
Regards,
Anthony Liguori
Signed-off-by: Adam Litke<a...@us.ibm.com>
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 301c75e..7c93739 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,7 @@ check-qjson: check-qjson.o $(qobject-obj-y)
$(tools-obj-y)
test-coroutine: test-coroutine.o qemu-timer-common.o async.o
$(coroutine-obj-y) $(tools-obj-y)
$(qapi-obj-y): $(GENERATED_HEADERS)
-qapi-dir := $(BUILD_DIR)/qapi-generated
+qapi-dir := qapi-generated
test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I
$(qapi-dir)
qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
