more build system nonsense

diff --git a/xen-config-host.h b/xen-config-host.h
index a1ff530a92ec82fe0b9649aabccc2b96f3b271c9..2abb19b4c311268e2898e6cdeb5df9c87548ef0d 100644 (file)
--- 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 fae6d464914ab3814d3becf5743c62b3c236b6ff..b739aebbb60ebb17d4f48d8d99b249cff5be0dd1 100644 (file)
--- 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 74ae2c0ebbe2838a7c12231ebb53e7f2bb1d72c7..1679b7e02ddcbcbf6edd0c85b1486d5283b819d7 100644 (file)
--- 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 bedbf8574a13e029a958627f2795e3998b7eea59..de9a3c59de331da57d0d0a50de337fdc3d3c3d9b 100644 (file)
--- 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)