Mailing List Archive

Resolve merge failure.
ChangeSet 1.1391, 2005/04/28 14:33:33+01:00, mjw@wray-m-3.hpl.hp.com

Resolve merge failure.
Signed-off-by: Mike Wray <mike.wray@hp.com>



Makefile | 2 ++
1 files changed, 2 insertions(+)


diff -Nru a/tools/Makefile b/tools/Makefile
--- a/tools/Makefile 2005-05-13 16:05:23 -04:00
+++ b/tools/Makefile 2005-05-13 16:05:23 -04:00
@@ -10,7 +10,9 @@
SUBDIRS += python
SUBDIRS += xfrd
SUBDIRS += xcs
+ifndef XEN_NO_IOEMU
SUBDIRS += ioemu
+endif
SUBDIRS += pygrub

.PHONY: all install clean check check_clean

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog