[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 50/81] \!CONFIG_USER_ONLY == CONFIG_SOFTMMU
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 50/81] \!CONFIG_USER_ONLY == CONFIG_SOFTMMU |
Date: |
Mon, 3 Aug 2009 14:46:41 +0200 |
Use this to simplify Makefile.target and remove negative logic
Signed-off-by: Juan Quintela <address@hidden>
---
Makefile.target | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 5c3b212..6234648 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
@@ -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))
--
1.6.2.5
- [Qemu-devel] [PATCH 40/81] files are only compiled when CONFIG_ADLIB is defined, (continued)
- [Qemu-devel] [PATCH 40/81] files are only compiled when CONFIG_ADLIB is defined, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 41/81] Test if we need -lutil in ,/configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 42/81] Fold CURSES_LIBS into libsoftmmu_libs, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 43/81] Fold VNC_TLS_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 44/81] Fold VNC_SASL_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 45/81] Fold XEN_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 46/81] Fold BLUEZ_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 47/81] Fold FDT_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 48/81] Fold BRLAPI_LIBS into libs_softmmu, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 49/81] remove duplicated TARGET_GPROF code, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 50/81] \!CONFIG_USER_ONLY == CONFIG_SOFTMMU,
Juan Quintela <=
- [Qemu-devel] [PATCH 51/81] Introduce CONFIG_NOSOFTFLOAT and simplify Makefile.target, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 52/81] permit to add things to LDFLAGS for target, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 53/81] refactor linker_script common part and change quoting, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 54/81] permit to add things to CFLAGS per target, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 55/81] fix typo, there should be bsd_user there, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 56/81] Move alpha CFLAGS target to configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 57/81] Move ia64 QEMU_CFLAGS target to configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 58/81] this bit was already generated in configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 59/81] Fold TARGET_GPROF handling in configure, Juan Quintela, 2009/08/03
- [Qemu-devel] [PATCH 60/81] Generate more conmmon CFLAGS, Juan Quintela, 2009/08/03