From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Fri, 30 May 2008 16:44:04 +0000 (+0100)
Subject: more build system nonsense
X-Git-Tag: xen-3.3.0-rc1~136
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bd9966dc763d30bbf4955977c8d819cbc27339dd;p=qemu-xen-4.6-testing.git

more build system nonsense
---

diff --git a/xen-config-host.h b/xen-config-host.h
index a1ff530a9..2abb19b4c 100644
--- a/xen-config-host.h
+++ b/xen-config-host.h
@@ -1,2 +1,9 @@
 extern char domain_name[64];
 extern int domid;
+
+#define bool xen_bool
+#include "xenctrl.h"
+#include "xs.h"
+#undef bool
+
+extern int xc_handle;
diff --git a/xen-config-host.mak b/xen-config-host.mak
index fae6d4649..b739aebbb 100644
--- a/xen-config-host.mak
+++ b/xen-config-host.mak
@@ -1 +1,7 @@
+QEMU_ROOT ?= .
+XEN_ROOT ?= $(QEMU_ROOT)/../xen-unstable.hg
+include $(XEN_ROOT)/tools/Rules.mk
+
 TARGET_DIRS=i386-dm
+
+include xen-hooks.mak
diff --git a/xen-config.mak b/xen-config.mak
index 74ae2c0eb..1679b7e02 100644
--- a/xen-config.mak
+++ b/xen-config.mak
@@ -1,6 +1,6 @@
+QEMU_ROOT ?= .
+XEN_ROOT ?= $(QEMU_ROOT)/../../xen-unstable.hg
 include ../config-host.mak
-XEN_ROOT ?= ../../xen-unstable.hg
-include $(XEN_ROOT)/tools/Rules.mk
 
 TARGET_ARCH=i386
 CONFIG_SOFTMMU=yes
diff --git a/xen-hooks.mak b/xen-hooks.mak
index bedbf8574..de9a3c59d 100644
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -9,10 +9,11 @@ endif
 
 QEMU_PROG=qemu-dm
 
-CFLAGS += -Wno-unused -Wno-declaration-after-statement
+CFLAGS += -Wno-unused -Wno-declaration-after-statement \
+ -Wno-pointer-sign
 
-LIBS += -L../../libxc -lxenctrl -lxenguest
-LIBS += -L../../xenstore -lxenstore
+LIBS += -L$(XEN_ROOT)/tools/libxc -lxenctrl -lxenguest
+LIBS += -L$(XEN_ROOT)/tools/xenstore -lxenstore
 
 LDFLAGS := $(CFLAGS) $(LDFLAGS)