diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-10-18 10:01:37 -0700 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-10-18 10:01:37 -0700 |
| commit | 1cb9b64df380f232bcd142ab27c085cff0add1d8 (patch) | |
| tree | 9b09a466f5b51e6923cf31fd52d1f3d8ca2ba39a /target-i386 | |
| parent | c21611ab8d0d6e0b3f3e5483777b5c929fb5a96c (diff) | |
| parent | 2324841c0275f31505168e7a6ceb71bcede92d33 (diff) | |
| download | hqemu-1cb9b64df380f232bcd142ab27c085cff0add1d8.zip hqemu-1cb9b64df380f232bcd142ab27c085cff0add1d8.tar.gz | |
Merge remote-tracking branch 'bonzini/configure' into staging
# By Peter Maydell (3) and Ákos Kovács (2)
# Via Paolo Bonzini
* bonzini/configure:
ui/Makefile.objs: delete unnecessary cocoa.o dependency
default-configs/: CONFIG_GDBSTUB_XML removed
Makefile.target: CONFIG_NO_* variables removed
rules.mak: New string testing functions
rules.mak: New logical functions for handling y/n values
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-i386/Makefile.objs b/target-i386/Makefile.objs index da1fc40..027b94e 100644 --- a/target-i386/Makefile.objs +++ b/target-i386/Makefile.objs @@ -4,6 +4,6 @@ obj-y += smm_helper.o misc_helper.o mem_helper.o seg_helper.o obj-y += gdbstub.o obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o obj-$(CONFIG_KVM) += kvm.o -obj-$(CONFIG_NO_KVM) += kvm-stub.o +obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o obj-$(CONFIG_LINUX_USER) += ioport-user.o obj-$(CONFIG_BSD_USER) += ioport-user.o |
