diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-04 15:58:46 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-04 15:58:46 +0100 |
| commit | 234e256511e588680300600ce087c5185d68cf2a (patch) | |
| tree | 172ffea72fc1ffa5704e125a082ecfb7f4c47f30 /configure | |
| parent | be8bf83d1f0b589767e6e85e3e197b00c2850374 (diff) | |
| parent | 1338a4b72659ce08eacb9de0205fe16202a22d9c (diff) | |
| download | qemu-234e256511e588680300600ce087c5185d68cf2a.zip qemu-234e256511e588680300600ce087c5185d68cf2a.tar.gz qemu-234e256511e588680300600ce087c5185d68cf2a.tar.bz2 | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-build-2019-07-02-v2' into staging
Build system patches for 2019-07-02
# gpg: Signature made Wed 03 Jul 2019 12:44:28 BST
# gpg: using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg: issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg: aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867 4E5F 3870 B400 EB91 8653
* remotes/armbru/tags/pull-build-2019-07-02-v2:
Makefile: Reuse all's recursion machinery for clean and install
Makefile: Rename targets for make recursion
Makefile: Drop bogus cleaning of $(ALL_SUBDIRS)/qemu-options.def
Makefile: Remove code to smooth transition to config.status
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -6617,7 +6617,7 @@ if test "$slirp" != "no"; then echo "SLIRP_LIBS=$slirp_libs" >> $config_host_mak fi if [ "$slirp" = "git" -o "$slirp" = "internal" ]; then - echo "config-host.h: subdir-slirp" >> $config_host_mak + echo "config-host.h: slirp/all" >> $config_host_mak fi if test "$vde" = "yes" ; then echo "CONFIG_VDE=y" >> $config_host_mak @@ -7889,10 +7889,10 @@ if test -n "$enabled_cross_compilers"; then fi if [ "$fdt" = "git" ]; then - echo "config-host.h: subdir-dtc" >> $config_host_mak + echo "config-host.h: dtc/all" >> $config_host_mak fi if [ "$capstone" = "git" -o "$capstone" = "internal" ]; then - echo "config-host.h: subdir-capstone" >> $config_host_mak + echo "config-host.h: capstone/all" >> $config_host_mak fi if test -n "$LIBCAPSTONE"; then echo "LIBCAPSTONE=$LIBCAPSTONE" >> $config_host_mak |