proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-07-09 13:18:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

\!CONFIG_USER_ONLY == CONFIG_SOFTMMU

Browse Source 
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:
This commit is contained in:
Juan Quintela 2009-08-03 14:46:41 +02:00 committed by Anthony Liguori
parent 7ce9361c5e
commit 76dfdd24de
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile.target
View File

@ -77,9 +77,7 @@ endif
ifeq ($(TARGET_BASE_ARCH), cris) ifeq ($(TARGET_BASE_ARCH), cris)
libobj-y += cris-dis.o libobj-y += cris-dis.o
ifndef CONFIG_USER_ONLY libobj-$(CONFIG_SOFTMMU) += mmu.o
libobj-y += mmu.o
endif
endif endif
# NOTE: the disassembler code is only needed for debugging # NOTE: the disassembler code is only needed for debugging
@ -99,9 +97,7 @@ libobj-y += ppc-dis.o
endif endif
ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze) ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze)
libobj-y += microblaze-dis.o libobj-y += microblaze-dis.o
ifndef CONFIG_USER_ONLY libobj-$(CONFIG_SOFTMMU) += mmu.o
libobj-y += mmu.o
endif
endif endif
ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips) ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips)
libobj-y += mips-dis.o libobj-y += mips-dis.o
@ -217,7 +213,7 @@ endif #CONFIG_BSD_USER
######################################################### #########################################################
# System emulator target # 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 \ 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 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) LIBS += $(COCOA_LIBS) $(VDE_LIBS) $(CURL_LIBS)
ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
endif # !CONFIG_USER_ONLY endif # CONFIG_SOFTMMU
$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS) $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS)
$(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))