From 7c45e593a9aae9923cc988c776858622598f8da1 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Fri, 30 May 2008 18:01:30 +0100
Subject: [PATCH] build system more sanity ...

---
 xen-config-host.mak | 2 +-
 xen-config.mak      | 7 +++++--
 xen-hooks.mak       | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/xen-config-host.mak b/xen-config-host.mak
index b739aebbb..58ce0b186 100644
--- 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 1679b7e02..256bcef0a 100644
--- 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 de9a3c59d..9a0547b83 100644
--- 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))
-- 
2.39.5