diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-12-21 21:11:47 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2016-12-21 21:11:48 +0000 |
commit | d1e8e8ecc3d2a1a72504912d671f1cbbac1b06e5 (patch) | |
tree | 2b450d96b01455df8ed908bf8f26ddc388a03380 /Makefile.objs | |
parent | 82ecffa8c050bf5bbc13329e9b65eac1caa5b55c (diff) | |
parent | fcf5ef2ab52c621a4617ebbef36bf43b4003f4c0 (diff) |
Merge remote-tracking branch 'remotes/huth/tags/target-dirs-20161220' into staging
Move target-xxx folders to target/ directory
# gpg: Signature made Tue 20 Dec 2016 21:00:39 GMT
# gpg: using RSA key 0x2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg: aka "Thomas Huth <thuth@redhat.com>"
# gpg: aka "Thomas Huth <huth@tuxfamily.org>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5
* remotes/huth/tags/target-dirs-20161220:
Move target-* CPU file into a target/ folder
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile.objs')
-rw-r--r-- | Makefile.objs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.objs b/Makefile.objs index 06f74b8b99..e59b97947a 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -155,11 +155,11 @@ trace-events-y += hw/alpha/trace-events trace-events-y += ui/trace-events trace-events-y += audio/trace-events trace-events-y += net/trace-events -trace-events-y += target-arm/trace-events -trace-events-y += target-i386/trace-events -trace-events-y += target-sparc/trace-events -trace-events-y += target-s390x/trace-events -trace-events-y += target-ppc/trace-events +trace-events-y += target/arm/trace-events +trace-events-y += target/i386/trace-events +trace-events-y += target/sparc/trace-events +trace-events-y += target/s390x/trace-events +trace-events-y += target/ppc/trace-events trace-events-y += qom/trace-events trace-events-y += linux-user/trace-events trace-events-y += qapi/trace-events |