ia64/xen-unstable

changeset 12767:af10df2fed35

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@xensource.com>
author Ewan Mellor <ewan@xensource.com>
date Sat Dec 02 16:39:53 2006 +0000 (2006-12-02)
parents 1edaf60343a7
children de8abd5ce652
files Config.mk tools/Makefile tools/check/Makefile tools/check/check_libvncserver tools/check/check_sdl
line diff
     1.1 --- a/Config.mk	Fri Dec 01 18:35:19 2006 +0000
     1.2 +++ b/Config.mk	Sat Dec 02 16:39:53 2006 +0000
     1.3 @@ -69,8 +69,8 @@ ACM_DEFAULT_SECURITY_POLICY ?= ACM_NULL_
     1.4  
     1.5  # Optional components
     1.6  XENSTAT_XENTOP ?= y
     1.7 -
     1.8  VTPM_TOOLS ?= n
     1.9  LIBXENAPI_BINDINGS ?= n
    1.10 +XENFB_TOOLS ?= n
    1.11  
    1.12  -include $(XEN_ROOT)/.config
     2.1 --- a/tools/Makefile	Fri Dec 01 18:35:19 2006 +0000
     2.2 +++ b/tools/Makefile	Sat Dec 02 16:39:53 2006 +0000
     2.3 @@ -19,7 +19,7 @@ SUBDIRS-y += xenstat
     2.4  SUBDIRS-y += libaio
     2.5  SUBDIRS-y += blktap
     2.6  SUBDIRS-y += libfsimage
     2.7 -SUBDIRS-y += xenfb
     2.8 +SUBDIRS-$(XENFB_TOOLS) += xenfb
     2.9  SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
    2.10  
    2.11  # These don't cross-compile
     3.1 --- a/tools/check/Makefile	Fri Dec 01 18:35:19 2006 +0000
     3.2 +++ b/tools/check/Makefile	Sat Dec 02 16:39:53 2006 +0000
     3.3 @@ -1,3 +1,5 @@
     3.4 +XEN_ROOT = ../..
     3.5 +include $(XEN_ROOT)/tools/Rules.mk
     3.6  
     3.7  .PHONY: all
     3.8  all: build
     3.9 @@ -5,7 +7,7 @@ all: build
    3.10  # Check this machine is OK for building on.
    3.11  .PHONY: build
    3.12  build:
    3.13 -	./chk build
    3.14 +	XENFB_TOOLS=$(XENFB_TOOLS) ./chk build
    3.15  
    3.16  # Check this machine is OK for installing on.
    3.17  # DO NOT use this check from 'make install' in the parent
    3.18 @@ -13,7 +15,7 @@ build:
    3.19  # copy rather than actually installing.
    3.20  .PHONY: install
    3.21  install:
    3.22 -	./chk install
    3.23 +	XENFB_TOOLS=$(XENFB_TOOLS) ./chk install
    3.24  
    3.25  .PHONY: clean
    3.26  clean:
     4.1 --- a/tools/check/check_libvncserver	Fri Dec 01 18:35:19 2006 +0000
     4.2 +++ b/tools/check/check_libvncserver	Sat Dec 02 16:39:53 2006 +0000
     4.3 @@ -1,6 +1,12 @@
     4.4  #!/bin/sh
     4.5  # CHECK-BUILD CHECK-INSTALL
     4.6  
     4.7 +if [ ! "$XENFB_TOOLS" = "y" ]
     4.8 +then
     4.9 +    echo -n "unused, "
    4.10 +    exit 0
    4.11 +fi
    4.12 +
    4.13  RC=0
    4.14  
    4.15  LIBVNCSERVER_CONFIG="$(which libvncserver-config)"
     5.1 --- a/tools/check/check_sdl	Fri Dec 01 18:35:19 2006 +0000
     5.2 +++ b/tools/check/check_sdl	Sat Dec 02 16:39:53 2006 +0000
     5.3 @@ -1,6 +1,12 @@
     5.4  #!/bin/sh
     5.5  # CHECK-BUILD CHECK-INSTALL
     5.6  
     5.7 +if [ ! "$XENFB_TOOLS" = "y" ]
     5.8 +then
     5.9 +    echo -n "unused, "
    5.10 +    exit 0
    5.11 +fi
    5.12 +
    5.13  RC=0
    5.14  
    5.15  SDL_CONFIG="$(which sdl-config)"