Message ID | 1322606869-25865-2-git-send-email-mdroth@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
On Tue, Nov 29, 2011 at 10:47 PM, Michael Roth <mdroth@linux.vnet.ibm.com> wrote: > Generally $(BUILD_DIR) == $(CURDIR), but that isn't necessarilly the > case, so use $(BUILD_DIR)/qapi-generated for generated files to > avoid potentionally sticking generating files in odd places outside > the build's include paths. > --- > Makefile | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Not applied to trivial tree yet. I want to let Stefano, Stefan Weil, or Anthony take a look too since we were all discussing these changes yesterday. Stefan
diff --git a/Makefile b/Makefile index 168093c..0b4b2c3 100644 --- a/Makefile +++ b/Makefile @@ -167,7 +167,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 := qapi-generated +qapi-dir := $(BUILD_DIR)/qapi-generated test-visitor.o test-qmp-commands.o qemu-ga$(EXESUF): QEMU_CFLAGS += -I $(qapi-dir) qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)