diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-03-16 14:23:10 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-03-16 14:23:10 +0000 |
| commit | 094a9a7cd677237a07b4e4f1e8a39a5af38d0cbe (patch) | |
| tree | 9682577c2b9e06fc6a0ef633ba9499b4f0832f0a /tests | |
| parent | 699f6c6fd420e8c38f1f746f85815f4e88be11c6 (diff) | |
| parent | 8755b4afbdcf1c274cab7545a9f76d3d6c7f5c29 (diff) | |
| download | qemu-094a9a7cd677237a07b4e4f1e8a39a5af38d0cbe.tar.gz | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Pull request
Tracing makefile fixes for QEMU 2.9.
# gpg: Signature made Thu 16 Mar 2017 06:56:10 GMT
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/tracing-pull-request:
trace: ensure $(tracetool-y) is defined in top level makefile
makefile: generate trace-events-all upfront
makefile: merge GENERATED_HEADERS & GENERATED_SOURCES variables
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index e6e00b40e6..402e71cf06 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -494,7 +494,7 @@ qapi-schema += unknown-expr-key.json check-qapi-schema-y := $(addprefix tests/qapi-schema/, $(qapi-schema)) -GENERATED_HEADERS += tests/test-qapi-types.h tests/test-qapi-visit.h \ +GENERATED_FILES += tests/test-qapi-types.h tests/test-qapi-visit.h \ tests/test-qmp-commands.h tests/test-qapi-event.h \ tests/test-qmp-introspect.h |