Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
commit094a9a7cd677237a07b4e4f1e8a39a5af38d0cbe
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 16 Mar 2017 14:23:10 +0000 (16 14:23 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 16 Mar 2017 14:23:10 +0000 (16 14:23 +0000)
tree9682577c2b9e06fc6a0ef633ba9499b4f0832f0a
parent699f6c6fd420e8c38f1f746f85815f4e88be11c6
parent8755b4afbdcf1c274cab7545a9f76d3d6c7f5c29
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>
Makefile
tests/Makefile.include