diff mbox

[v2,02/71] Makefile.target: CONFIG_NO_* variables removed

Message ID 1380249092-4775-3-git-send-email-akoskovacs@gmx.com
State New
Headers show

Commit Message

Ákos Kovács Sept. 27, 2013, 2:30 a.m. UTC 
CONFIG_NO_* variables replaced with the lnot logical function.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
 Makefile.target      | 8 ++------
 hw/pci/Makefile.objs | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

Comments

Peter Maydell Sept. 27, 2013, 2:57 a.m. UTC | #1 
On 27 September 2013 11:30, Ákos Kovács <akoskovacs@gmx.com> wrote:
> CONFIG_NO_* variables replaced with the lnot logical function.
>
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> ---
>  Makefile.target      | 8 ++------
>  hw/pci/Makefile.objs | 2 +-
>  2 files changed, 3 insertions(+), 7 deletions(-)

This is still your broken version which missed some CONFIG_NO_*
uses that need removing. I suggest you just incorporate my
v2 series patches into your series instead if they haven't been
committed yet (don't forget to include Paolo's reviewed-by tag):
http://lists.nongnu.org/archive/html/qemu-devel/2013-09/msg02443.html

thanks
-- PMM
diff mbox

Patch

diff --git a/Makefile.target b/Makefile.target
index 9a49852..bbc668b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -70,10 +70,6 @@  all: $(PROGS) stap
 # Dummy command so that make thinks it has done something
 	@true
 
-CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y)
-CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)
-CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y)
-
 #########################################################
 # cpu emulator library
 obj-y = exec.o translate-all.o cpu-exec.o
@@ -84,7 +80,7 @@  obj-y += fpu/softfloat.o
 obj-y += target-$(TARGET_BASE_ARCH)/
 obj-y += disas.o
 obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
-obj-$(CONFIG_NO_KVM) += kvm-stub.o
+obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
 
 #########################################################
 # Linux user emulator target
@@ -125,7 +121,7 @@  LIBS+=$(libs_softmmu)
 
 # xen support
 obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o
-obj-$(CONFIG_NO_XEN) += xen-stub.o
+obj-$(call lnot,$(CONFIG_XEN)) += xen-stub.o
 
 # Hardware support
 ifeq ($(TARGET_NAME), sparc64)
diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs
index 720f438..80f8aa6 100644
--- a/hw/pci/Makefile.objs
+++ b/hw/pci/Makefile.objs
@@ -5,7 +5,7 @@  common-obj-$(CONFIG_PCI) += slotid_cap.o
 common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
 common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
 
-common-obj-$(CONFIG_NO_PCI) += pci-stub.o
+common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o
 common-obj-$(CONFIG_ALL) += pci-stub.o
 
 common-obj-$(CONFIG_PCI_HOTPLUG_OLD) += pci-hotplug-old.o