Merge remote-tracking branch 'remotes/ehabkost/tags/numa-pull-request' into staging

[qemu.git] / Makefile.objs

diff --git a/Makefile.objs b/Makefile.objs
index 5cd3d816ffb07caa39e5bd4c720342fa27060b18..bc43e5c1dd06285632ae92f8226eadde0e050dbb 100644 (file)
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -1,7 +1,8 @@
 #######################################################################
 # Common libraries for tools and emulators
 stub-obj-y = stubs/
 #######################################################################
 # Common libraries for tools and emulators
 stub-obj-y = stubs/

-util-obj-y = util/ qobject/ qapi/ trace/
+util-obj-y = util/ qobject/ qapi/
+util-obj-y += qmp-introspect.o qapi-types.o qapi-visit.o qapi-event.o

 
 #######################################################################
 # block-obj-y is code used by both qemu system emulation and qemu-img
 
 #######################################################################
 # block-obj-y is code used by both qemu system emulation and qemu-img


@@ -12,7 +13,6 @@ block-obj-y += main-loop.o iohandler.o qemu-timer.o
 block-obj-$(CONFIG_POSIX) += aio-posix.o
 block-obj-$(CONFIG_WIN32) += aio-win32.o
 block-obj-y += block/
 block-obj-$(CONFIG_POSIX) += aio-posix.o
 block-obj-$(CONFIG_WIN32) += aio-win32.o
 block-obj-y += block/

-block-obj-y += qapi-types.o qapi-visit.o

 block-obj-y += qemu-io-cmds.o
 
 block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o
 block-obj-y += qemu-io-cmds.o
 
 block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o


@@ -21,16 +21,16 @@ block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o
 
 block-obj-m = block/
 
 
 block-obj-m = block/
 

+#######################################################################
+# crypto-obj-y is code used by both qemu system emulation and qemu-img

 
 

-######################################################################
-# smartcard
+crypto-obj-y = crypto/
+crypto-aes-obj-y = crypto/

 
 

-libcacard-y += libcacard/cac.o libcacard/event.o
-libcacard-y += libcacard/vcard.o libcacard/vreader.o
-libcacard-y += libcacard/vcard_emul_nss.o
-libcacard-y += libcacard/vcard_emul_type.o
-libcacard-y += libcacard/card_7816.o
-libcacard-y += libcacard/vcardt.o
+#######################################################################
+# qom-obj-y is code used by both qemu system emulation and qemu-img
+
+qom-obj-y = qom/

 
 ######################################################################
 # Target independent part of system emulation. The long term path is to
 
 ######################################################################
 # Target independent part of system emulation. The long term path is to


@@ -39,6 +39,7 @@ libcacard-y += libcacard/vcardt.o
 
 ifeq ($(CONFIG_SOFTMMU),y)
 common-obj-y = blockdev.o blockdev-nbd.o block/
 
 ifeq ($(CONFIG_SOFTMMU),y)
 common-obj-y = blockdev.o blockdev-nbd.o block/

+common-obj-y += iothread.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


@@ -46,26 +47,24 @@ common-obj-$(CONFIG_POSIX) += os-posix.o
 
 common-obj-$(CONFIG_LINUX) += fsdev/
 
 
 common-obj-$(CONFIG_LINUX) += fsdev/
 

-common-obj-y += migration.o migration-tcp.o
-common-obj-y += vmstate.o
-common-obj-y += qemu-file.o
-common-obj-$(CONFIG_RDMA) += migration-rdma.o
+common-obj-y += migration/

 common-obj-y += qemu-char.o #aio.o
 common-obj-y += qemu-char.o #aio.o

-common-obj-y += block-migration.o
-common-obj-y += page_cache.o xbzrle.o
-
-common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
+common-obj-y += page_cache.o
+common-obj-y += qjson.o

 
 common-obj-$(CONFIG_SPICE) += spice-qemu-char.o
 
 common-obj-y += audio/
 common-obj-y += hw/
 
 common-obj-$(CONFIG_SPICE) += spice-qemu-char.o
 
 common-obj-y += audio/
 common-obj-y += hw/

+common-obj-y += accel.o

 
 common-obj-y += ui/
 common-obj-y += bt-host.o bt-vhci.o
 
 common-obj-y += ui/
 common-obj-y += bt-host.o bt-vhci.o

+bt-host.o-cflags := $(BLUEZ_CFLAGS)

 
 common-obj-y += dma-helpers.o
 common-obj-y += vl.o
 
 common-obj-y += dma-helpers.o
 common-obj-y += vl.o

+vl.o-cflags := $(GPROF_CFLAGS) $(SDL_CFLAGS)

 common-obj-y += tpm.o
 
 common-obj-$(CONFIG_SLIRP) += slirp/
 common-obj-y += tpm.o
 
 common-obj-$(CONFIG_SLIRP) += slirp/


@@ -74,20 +73,16 @@ common-obj-y += backends/
 
 common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
 
 
 common-obj-$(CONFIG_SECCOMP) += qemu-seccomp.o
 

-common-obj-$(CONFIG_SMARTCARD_NSS) += $(libcacard-y)
+common-obj-$(CONFIG_FDT) += device_tree.o

 
 ######################################################################
 # qapi
 
 common-obj-y += qmp-marshal.o
 
 ######################################################################
 # qapi
 
 common-obj-y += qmp-marshal.o

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

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

-######################################################################
-# some qapi visitors are used by both system and user emulation:
-
-common-obj-y += qapi-visit.o qapi-types.o
-

 #######################################################################
 # Target-independent parts used in system and user emulation
 common-obj-y += qemu-log.o
 #######################################################################
 # Target-independent parts used in system and user emulation
 common-obj-y += qemu-log.o


@@ -101,10 +96,15 @@ common-obj-y += disas/
 version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
 version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo
 
 version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
 version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo
 

+######################################################################
+# tracing
+util-obj-y +=  trace/
+target-obj-y += trace/
+

 ######################################################################
 # 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.
 ######################################################################
 # 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.

-qga-obj-y = qga/ qapi-types.o qapi-visit.o
+qga-obj-y = qga/

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