tests/fp: add fp-bench

[qemu.git] / Makefile.objs

diff --git a/Makefile.objs b/Makefile.objs
index 323ef12384cee2deaae3003532c9d809605b019d..56af0347d377d0234a30d5f0f5f621e7d9b8bada 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -1,8 +1,19 @@
+QAPI_MODULES = block-core block char common crypto introspect job migration
+QAPI_MODULES += misc net rocker run-state sockets tpm trace transaction ui
+

 #######################################################################
 # Common libraries for tools and emulators
 stub-obj-y = stubs/ crypto/
 util-obj-y = util/ qobject/ qapi/
 #######################################################################
 # Common libraries for tools and emulators
 stub-obj-y = stubs/ crypto/
 util-obj-y = util/ qobject/ qapi/

-util-obj-y += qmp-introspect.o qapi-types.o qapi-visit.o qapi-event.o
+util-obj-y += qapi/qapi-builtin-types.o
+util-obj-y += qapi/qapi-types.o
+util-obj-y += $(QAPI_MODULES:%=qapi/qapi-types-%.o)
+util-obj-y += qapi/qapi-builtin-visit.o
+util-obj-y += qapi/qapi-visit.o
+util-obj-y += $(QAPI_MODULES:%=qapi/qapi-visit-%.o)
+util-obj-y += qapi/qapi-events.o
+util-obj-y += $(QAPI_MODULES:%=qapi/qapi-events-%.o)
+util-obj-y += qapi/qapi-introspect.o

 
 chardev-obj-y = chardev/
 
 
 chardev-obj-y = chardev/
 


@@ -10,7 +21,7 @@ chardev-obj-y = chardev/
 # block-obj-y is code used by both qemu system emulation and qemu-img
 
 block-obj-y += nbd/
 # block-obj-y is code used by both qemu system emulation and qemu-img
 
 block-obj-y += nbd/

-block-obj-y += block.o blockjob.o
+block-obj-y += block.o blockjob.o job.o

 block-obj-y += block/ scsi/
 block-obj-y += qemu-io-cmds.o
 block-obj-$(CONFIG_REPLICATION) += replication.o
 block-obj-y += block/ scsi/
 block-obj-y += qemu-io-cmds.o
 block-obj-$(CONFIG_REPLICATION) += replication.o


@@ -41,6 +52,7 @@ io-obj-y = io/
 ifeq ($(CONFIG_SOFTMMU),y)
 common-obj-y = blockdev.o blockdev-nbd.o block/
 common-obj-y += bootdevice.o iothread.o
 ifeq ($(CONFIG_SOFTMMU),y)
 common-obj-y = blockdev.o blockdev-nbd.o block/
 common-obj-y += bootdevice.o iothread.o

+common-obj-y += job-qmp.o

 common-obj-y += net/
 common-obj-y += qdev-monitor.o device-hotplug.o
 common-obj-$(CONFIG_WIN32) += os-win32.o
 common-obj-y += net/
 common-obj-y += qdev-monitor.o device-hotplug.o
 common-obj-$(CONFIG_WIN32) += os-win32.o


@@ -51,11 +63,13 @@ common-obj-$(CONFIG_LINUX) += fsdev/
 common-obj-y += migration/
 
 common-obj-y += audio/
 common-obj-y += migration/
 
 common-obj-y += audio/

+common-obj-m += audio/

 common-obj-y += hw/
 
 common-obj-y += replay/
 
 common-obj-y += ui/
 common-obj-y += hw/
 
 common-obj-y += replay/
 
 common-obj-y += ui/

+common-obj-m += ui/

 common-obj-y += bt-host.o bt-vhci.o
 bt-host.o-cflags := $(BLUEZ_CFLAGS)
 
 common-obj-y += bt-host.o bt-vhci.o
 bt-host.o-cflags := $(BLUEZ_CFLAGS)
 


@@ -78,8 +92,9 @@ common-obj-$(CONFIG_FDT) += device_tree.o
 ######################################################################
 # qapi
 
 ######################################################################
 # qapi
 

-common-obj-y += qmp-marshal.o
-common-obj-y += qmp-introspect.o
+common-obj-y += qapi/qapi-commands.o
+common-obj-y += $(QAPI_MODULES:%=qapi/qapi-commands-%.o)
+common-obj-y += qapi/qapi-introspect.o

 common-obj-y += qmp.o hmp.o
 endif
 
 common-obj-y += qmp.o hmp.o
 endif
 


@@ -102,13 +117,15 @@ target-obj-y += trace/
 ######################################################################
 # guest agent
 
 ######################################################################
 # guest agent
 

-# FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed
-# by libqemuutil.a.  These should be moved to a separate .json schema.
+# FIXME: a few definitions from qapi/qapi-types.o and
+# qapi/qapi-visit.o are needed by libqemuutil.a.  These should be
+# extracted into a QAPI schema module, or perhaps a separate schema.

 qga-obj-y = qga/
 qga-vss-dll-obj-y = qga/
 
 ######################################################################
 # contrib
 qga-obj-y = qga/
 qga-vss-dll-obj-y = qga/
 
 ######################################################################
 # contrib

+elf2dmp-obj-y = contrib/elf2dmp/

 ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
 ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
 libvhost-user-obj-y = contrib/libvhost-user/
 ivshmem-client-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-client/
 ivshmem-server-obj-$(CONFIG_IVSHMEM) = contrib/ivshmem-server/
 libvhost-user-obj-y = contrib/libvhost-user/


@@ -119,61 +136,68 @@ vhost-user-blk-obj-y = contrib/vhost-user-blk/
 
 ######################################################################
 trace-events-subdirs =
 
 ######################################################################
 trace-events-subdirs =

-trace-events-subdirs += util
-trace-events-subdirs += crypto
-trace-events-subdirs += io
-trace-events-subdirs += migration
+trace-events-subdirs += accel/kvm
+trace-events-subdirs += accel/tcg
+trace-events-subdirs += audio

 trace-events-subdirs += block
 trace-events-subdirs += chardev
 trace-events-subdirs += block
 trace-events-subdirs += chardev

+trace-events-subdirs += crypto
+trace-events-subdirs += hw/9pfs
+trace-events-subdirs += hw/acpi
+trace-events-subdirs += hw/alpha
+trace-events-subdirs += hw/arm
+trace-events-subdirs += hw/audio

 trace-events-subdirs += hw/block
 trace-events-subdirs += hw/block/dataplane
 trace-events-subdirs += hw/char
 trace-events-subdirs += hw/block
 trace-events-subdirs += hw/block/dataplane
 trace-events-subdirs += hw/char

-trace-events-subdirs += hw/intc
-trace-events-subdirs += hw/net
-trace-events-subdirs += hw/virtio
-trace-events-subdirs += hw/audio
-trace-events-subdirs += hw/misc
-trace-events-subdirs += hw/usb
-trace-events-subdirs += hw/scsi
-trace-events-subdirs += hw/nvram

 trace-events-subdirs += hw/display
 trace-events-subdirs += hw/display

-trace-events-subdirs += hw/input
-trace-events-subdirs += hw/timer

 trace-events-subdirs += hw/dma
 trace-events-subdirs += hw/dma

-trace-events-subdirs += hw/sparc
-trace-events-subdirs += hw/sparc64
-trace-events-subdirs += hw/sd
-trace-events-subdirs += hw/isa
-trace-events-subdirs += hw/mem
+trace-events-subdirs += hw/hppa
+trace-events-subdirs += hw/i2c

 trace-events-subdirs += hw/i386
 trace-events-subdirs += hw/i386/xen
 trace-events-subdirs += hw/i386
 trace-events-subdirs += hw/i386/xen

-trace-events-subdirs += hw/9pfs
-trace-events-subdirs += hw/ppc
+trace-events-subdirs += hw/ide
+trace-events-subdirs += hw/input
+trace-events-subdirs += hw/intc
+trace-events-subdirs += hw/isa
+trace-events-subdirs += hw/mem
+trace-events-subdirs += hw/misc
+trace-events-subdirs += hw/misc/macio
+trace-events-subdirs += hw/net
+trace-events-subdirs += hw/nvram

 trace-events-subdirs += hw/pci
 trace-events-subdirs += hw/pci-host
 trace-events-subdirs += hw/pci
 trace-events-subdirs += hw/pci-host

+trace-events-subdirs += hw/ppc
+trace-events-subdirs += hw/rdma
+trace-events-subdirs += hw/rdma/vmw

 trace-events-subdirs += hw/s390x
 trace-events-subdirs += hw/s390x

+trace-events-subdirs += hw/scsi
+trace-events-subdirs += hw/sd
+trace-events-subdirs += hw/sparc
+trace-events-subdirs += hw/sparc64
+trace-events-subdirs += hw/timer
+trace-events-subdirs += hw/tpm
+trace-events-subdirs += hw/usb

 trace-events-subdirs += hw/vfio
 trace-events-subdirs += hw/vfio

-trace-events-subdirs += hw/acpi
-trace-events-subdirs += hw/arm
-trace-events-subdirs += hw/alpha
+trace-events-subdirs += hw/virtio
+trace-events-subdirs += hw/watchdog

 trace-events-subdirs += hw/xen
 trace-events-subdirs += hw/xen

-trace-events-subdirs += hw/ide
-trace-events-subdirs += ui
-trace-events-subdirs += audio
+trace-events-subdirs += io
+trace-events-subdirs += linux-user
+trace-events-subdirs += migration
+trace-events-subdirs += nbd

 trace-events-subdirs += net
 trace-events-subdirs += net

+trace-events-subdirs += qapi
+trace-events-subdirs += qom
+trace-events-subdirs += scsi

 trace-events-subdirs += target/arm
 trace-events-subdirs += target/i386
 trace-events-subdirs += target/mips
 trace-events-subdirs += target/arm
 trace-events-subdirs += target/i386
 trace-events-subdirs += target/mips

-trace-events-subdirs += target/sparc
-trace-events-subdirs += target/s390x

 trace-events-subdirs += target/ppc
 trace-events-subdirs += target/ppc

-trace-events-subdirs += qom
-trace-events-subdirs += linux-user
-trace-events-subdirs += qapi
-trace-events-subdirs += accel/tcg
-trace-events-subdirs += accel/kvm
-trace-events-subdirs += nbd
-trace-events-subdirs += scsi
+trace-events-subdirs += target/s390x
+trace-events-subdirs += target/sparc
+trace-events-subdirs += ui
+trace-events-subdirs += util

 
 trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)
 
 
 trace-events-files = $(SRC_PATH)/trace-events $(trace-events-subdirs:%=$(SRC_PATH)/%/trace-events)