build system more sanity ...

diff --git a/xen-config-host.mak b/xen-config-host.mak
index b739aebbb60ebb17d4f48d8d99b249cff5be0dd1..58ce0b186db34239cce17580e20e2994ac24f499 100644 (file)
--- a/xen-config-host.mak
+++ b/xen-config-host.mak
@@ -4,4 +4,4 @@ include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET_DIRS=i386-dm
 
-include xen-hooks.mak
+include $(QEMU_ROOT)/xen-hooks.mak

diff --git a/xen-config.mak b/xen-config.mak
index 1679b7e02ddcbcbf6edd0c85b1486d5283b819d7..256bcef0afdc2155416e1d1ba03579b4772cda92 100644 (file)
--- a/xen-config.mak
+++ b/xen-config.mak
@@ -1,6 +1,9 @@
-QEMU_ROOT ?= .
-XEN_ROOT ?= $(QEMU_ROOT)/../../xen-unstable.hg
+QEMU_ROOT ?= ..
+XEN_ROOT ?= $(QEMU_ROOT)/../xen-unstable.hg
+
 include ../config-host.mak
 
 TARGET_ARCH=i386
 CONFIG_SOFTMMU=yes
+
+CFLAGS += -I$(QEMU_ROOT)/hw

diff --git a/xen-hooks.mak b/xen-hooks.mak
index de9a3c59de331da57d0d0a50de337fdc3d3c3d9b..9a0547b831fab6a931ea80afe9eeda71299e1288 100644 (file)
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -31,5 +31,6 @@ OBJS+= pass-through.o
 endif
 
 BAD_OBJS += loader.o monitor.o gdbstub.o acpi.o
+BAD_OBJS += vmmouse.o vmport.o tcg* helper.o disas.o
 
 OBJS := $(filter-out $(BAD_OBJS), $(OBJS))