Merge tag 'v2.4.0' into tizen_3.0_qemu_2.4

[sdk/emulator/qemu.git] / Makefile.target

diff --git a/Makefile.target b/Makefile.target
index 3e7aafd..edb2156 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -144,6 +144,15 @@ obj-$(CONFIG_XEN_I386) += xen-hvm.o xen-mapcache.o
 obj-$(call lnot,$(CONFIG_XEN)) += xen-common-stub.o
 obj-$(call lnot,$(CONFIG_XEN_I386)) += xen-hvm-stub.o
 
+# HAX support
+ifdef CONFIG_WIN32
+obj-$(CONFIG_HAX) += target-i386/hax-all.o target-i386/hax-windows.o
+endif
+ifdef CONFIG_DARWIN
+obj-$(CONFIG_HAX) += target-i386/hax-all.o target-i386/hax-darwin.o
+endif
+obj-$(call lnot,$(CONFIG_HAX)) += hax-stub.o
+
 # Hardware support
 ifeq ($(TARGET_NAME), sparc64)
 obj-y += hw/sparc64/
@@ -153,6 +162,12 @@ endif
 
 GENERATED_HEADERS += hmp-commands.h qmp-commands-old.h
 
+# Makefile for TIZEN-maru
+ifdef CONFIG_MARU
+obj-y += tizen/src/
+endif
+##
+
 endif # CONFIG_SOFTMMU
 
 # Workaround for http://gcc.gnu.org/PR55489, see configure.
@@ -164,6 +179,7 @@ all-obj-y := $(obj-y)
 target-obj-y :=
 block-obj-y :=
 common-obj-y :=
+
 include $(SRC_PATH)/Makefile.objs
 dummy := $(call unnest-vars,,target-obj-y)
 target-obj-y-save := $(target-obj-y)