# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID af10df2fed356a2700f7ce34638d6e9811baab74
# Parent 1edaf60343a7409e24d50a4a908e13d223dca3d3
Make the xenfb tools an optional part of the build, as they introduce new
dependencies (libvncserver and libsdl devel packages). Enable them with
XENFB_TOOLS=y.
Signed-off-by: Ewan Mellor <ewan@xxxxxxxxxxxxx>
---
Config.mk | 2 +-
tools/Makefile | 2 +-
tools/check/Makefile | 6 ++++--
tools/check/check_libvncserver | 6 ++++++
tools/check/check_sdl | 6 ++++++
5 files changed, 18 insertions(+), 4 deletions(-)
diff -r 1edaf60343a7 -r af10df2fed35 Config.mk
--- a/Config.mk Fri Dec 01 18:35:19 2006 +0000
+++ b/Config.mk Sat Dec 02 16:39:53 2006 +0000
@@ -69,8 +69,8 @@ ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_
# Optional components
XENSTAT_XENTOP ?= y
-
VTPM_TOOLS ?= n
LIBXENAPI_BINDINGS ?= n
+XENFB_TOOLS ?= n
-include $(XEN_ROOT)/.config
diff -r 1edaf60343a7 -r af10df2fed35 tools/Makefile
--- a/tools/Makefile Fri Dec 01 18:35:19 2006 +0000
+++ b/tools/Makefile Sat Dec 02 16:39:53 2006 +0000
@@ -19,7 +19,7 @@ SUBDIRS-y += libaio
SUBDIRS-y += libaio
SUBDIRS-y += blktap
SUBDIRS-y += libfsimage
-SUBDIRS-y += xenfb
+SUBDIRS-$(XENFB_TOOLS) += xenfb
SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
# These don't cross-compile
diff -r 1edaf60343a7 -r af10df2fed35 tools/check/Makefile
--- a/tools/check/Makefile Fri Dec 01 18:35:19 2006 +0000
+++ b/tools/check/Makefile Sat Dec 02 16:39:53 2006 +0000
@@ -1,3 +1,5 @@
+XEN_ROOT = ../..
+include $(XEN_ROOT)/tools/Rules.mk
.PHONY: all
all: build
@@ -5,7 +7,7 @@ all: build
# Check this machine is OK for building on.
.PHONY: build
build:
- ./chk build
+ XENFB_TOOLS=$(XENFB_TOOLS) ./chk build
# Check this machine is OK for installing on.
# DO NOT use this check from 'make install' in the parent
@@ -13,7 +15,7 @@ build:
# copy rather than actually installing.
.PHONY: install
install:
- ./chk install
+ XENFB_TOOLS=$(XENFB_TOOLS) ./chk install
.PHONY: clean
clean:
diff -r 1edaf60343a7 -r af10df2fed35 tools/check/check_libvncserver
--- a/tools/check/check_libvncserver Fri Dec 01 18:35:19 2006 +0000
+++ b/tools/check/check_libvncserver Sat Dec 02 16:39:53 2006 +0000
@@ -1,5 +1,11 @@
#!/bin/sh
# CHECK-BUILD CHECK-INSTALL
+
+if [ ! "$XENFB_TOOLS" = "y" ]
+then
+ echo -n "unused, "
+ exit 0
+fi
RC=0
diff -r 1edaf60343a7 -r af10df2fed35 tools/check/check_sdl
--- a/tools/check/check_sdl Fri Dec 01 18:35:19 2006 +0000
+++ b/tools/check/check_sdl Sat Dec 02 16:39:53 2006 +0000
@@ -1,5 +1,11 @@
#!/bin/sh
# CHECK-BUILD CHECK-INSTALL
+
+if [ ! "$XENFB_TOOLS" = "y" ]
+then
+ echo -n "unused, "
+ exit 0
+fi
RC=0
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home