diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-08-03 14:46:41 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-08-10 13:05:42 -0500 |
| commit | 76dfdd24de7e0081a4c121977eaaa9ce78b5eea9 (patch) | |
| tree | 1037117b0900dac2ffd075be727a377f21a95a3f /Makefile.target | |
| parent | 7ce9361c5e6aa002f07fe13c6f14b6b8615db0d0 (diff) | |
\!CONFIG_USER_ONLY == CONFIG_SOFTMMU
Use this to simplify Makefile.target and remove negative logic
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Makefile.target b/Makefile.target index b41b8a4a5c..6f0ed78db7 100644 --- a/Makefile.target +++ b/Makefile.target @@ -77,9 +77,7 @@ endif ifeq ($(TARGET_BASE_ARCH), cris) libobj-y += cris-dis.o -ifndef CONFIG_USER_ONLY -libobj-y += mmu.o -endif +libobj-$(CONFIG_SOFTMMU) += mmu.o endif # NOTE: the disassembler code is only needed for debugging @@ -99,9 +97,7 @@ libobj-y += ppc-dis.o endif ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze) libobj-y += microblaze-dis.o -ifndef CONFIG_USER_ONLY -libobj-y += mmu.o -endif +libobj-$(CONFIG_SOFTMMU) += mmu.o endif ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips) libobj-y += mips-dis.o @@ -217,7 +213,7 @@ endif #CONFIG_BSD_USER ######################################################### # System emulator target -ifndef CONFIG_USER_ONLY +ifdef CONFIG_SOFTMMU obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \ gdbstub.o gdbstub-xml.o msix.o ioport.o qemu-config.o @@ -398,7 +394,7 @@ monitor.o: qemu-monitor.h LIBS += $(COCOA_LIBS) $(VDE_LIBS) $(CURL_LIBS) ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) -endif # !CONFIG_USER_ONLY +endif # CONFIG_SOFTMMU $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS) $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) |