aboutsummaryrefslogtreecommitdiffstats
path: root/tools/Makefile
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-12-28 10:55:50 +0000
committerKeir Fraser <keir.fraser@citrix.com>2009-12-28 10:55:50 +0000
commitbd9d6a42bcf9c3fdaafaf9a2bd24cef349fe134d (patch)
treec4af95bf00d9314fda02bf49210723798b4d5932 /tools/Makefile
parent2a3b9a4f928f05b6f873a5a26fe3ff4e7c0e54e4 (diff)
downloadxen-bd9d6a42bcf9c3fdaafaf9a2bd24cef349fe134d.tar.gz
xen-bd9d6a42bcf9c3fdaafaf9a2bd24cef349fe134d.tar.bz2
xen-bd9d6a42bcf9c3fdaafaf9a2bd24cef349fe134d.zip
memshr: Must be built on ia64 as well as x86, as blktap depends on it.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'tools/Makefile')
-rw-r--r--tools/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/Makefile b/tools/Makefile
index d5cffa2923..388a925d36 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -21,6 +21,7 @@ SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
SUBDIRS-$(VTPM_TOOLS) += vtpm
SUBDIRS-y += xenstat
SUBDIRS-$(CONFIG_Linux) += libaio
+SUBDIRS-$(CONFIG_Linux) += memshr
SUBDIRS-$(CONFIG_Linux) += blktap
SUBDIRS-$(CONFIG_Linux) += blktap2
SUBDIRS-$(CONFIG_NetBSD) += libaio
@@ -34,9 +35,7 @@ SUBDIRS-$(CONFIG_IOEMU) += ioemu-dir
SUBDIRS-y += xenpmd
SUBDIRS-y += libxl
SUBDIRS-y += remus
-
-SUBDIRS-$(CONFIG_X86)$(CONFIG_Linux) += memshr
-SUBDIRS-$(CONFIG_X86)$(CONFIG_Linux) += xenpaging
+SUBDIRS-$(CONFIG_X86) += xenpaging
# These don't cross-compile
ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))