From 000823449ca07e50086413338f907d7a817db2ce Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Sat, 19 Jan 2013 11:06:47 +0100 Subject: 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 Signed-off-by: Blue Swirl --- hw/Makefile.objs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'hw/Makefile.objs') diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 23ac24977e..260885d2cb 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 -- cgit v1.2.1