aboutsummaryrefslogtreecommitdiff
path: root/hw/Makefile.objs
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-01-19 11:06:47 +0100
committerBlue Swirl <blauwirbel@gmail.com>2013-01-26 13:15:35 +0000
commit000823449ca07e50086413338f907d7a817db2ce (patch)
treee5b0ea6435ef01e626d0babb336dbc8dd977e6ee /hw/Makefile.objs
parent737f351892e271fb3080c3c26e6453d939dd1d68 (diff)
downloadqemu-000823449ca07e50086413338f907d7a817db2ce.zip
qemu-000823449ca07e50086413338f907d7a817db2ce.tar.gz
qemu-000823449ca07e50086413338f907d7a817db2ce.tar.bz2
build: remove universal-obj-y
All of universal-obj-y, user-obj-y (right now unused) and common-obj-y can be unified into common-obj-y if we take care of defining CONFIG_SOFTMMU and CONFIG_USER_ONLY in the toplevel makefile. This is similar to how we define symbols for hardware components. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/Makefile.objs')
-rw-r--r--hw/Makefile.objs8
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 23ac249..260885d 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,9 +1,10 @@
# core qdev-related obj files, also used by *-user:
-universal-obj-y += qdev.o qdev-properties.o
+common-obj-y += qdev.o qdev-properties.o
# irq.o needed for qdev GPIO handling:
-universal-obj-y += irq.o
+common-obj-y += irq.o
-common-obj-y = usb/ ide/ pci/
+ifeq ($(CONFIG_SOFTMMU),y)
+common-obj-y += usb/ ide/ pci/
common-obj-y += loader.o
common-obj-$(CONFIG_VIRTIO) += virtio-console.o
common-obj-$(CONFIG_VIRTIO) += virtio-rng.o
@@ -217,3 +218,4 @@ obj-$(CONFIG_LINUX) += vfio_pci.o
endif
$(obj)/baum.o: QEMU_CFLAGS += $(SDL_CFLAGS)
+endif