ia64/xen-unstable

changeset 16906:f4ee7e5793cf

Add check to subdirs.
Also make sure that the install target doesn't call the install check.

Signed-off-by: Bastian Blank <waldi@debian.org>
author Keir Fraser <keir.fraser@citrix.com>
date Sat Jan 26 15:27:18 2008 +0000 (2008-01-26)
parents 363a1e845189
children d6c12530c69d
files tools/Makefile tools/check/Makefile
line diff
     1.1 --- a/tools/Makefile	Sat Jan 26 15:26:55 2008 +0000
     1.2 +++ b/tools/Makefile	Sat Jan 26 15:27:18 2008 +0000
     1.3 @@ -2,6 +2,7 @@ XEN_ROOT = ../
     1.4  include $(XEN_ROOT)/tools/Rules.mk
     1.5  
     1.6  SUBDIRS-y :=
     1.7 +SUBDIRS-y += check
     1.8  SUBDIRS-y += include
     1.9  SUBDIRS-y += libxc
    1.10  SUBDIRS-y += flask
    1.11 @@ -36,13 +37,13 @@ export CROSS_SYS_ROOT
    1.12  endif
    1.13  
    1.14  .PHONY: all
    1.15 -all: check
    1.16 +all:
    1.17  	@set -e; for subdir in $(SUBDIRS-y); do \
    1.18  		$(MAKE) subdir-$@-$$subdir; \
    1.19  	done
    1.20  
    1.21  .PHONY: install
    1.22 -install: check
    1.23 +install:
    1.24  	@set -e; for subdir in $(SUBDIRS-y); do \
    1.25  		$(MAKE) subdir-$@-$$subdir; \
    1.26  	done
    1.27 @@ -51,7 +52,7 @@ install: check
    1.28  	$(INSTALL_DIR) $(DESTDIR)/var/lib/xen
    1.29  
    1.30  .PHONY: clean
    1.31 -clean: check_clean
    1.32 +clean:
    1.33  	@set -e; for subdir in $(SUBDIRS-y); do \
    1.34  		$(MAKE) subdir-$@-$$subdir; \
    1.35  	done
    1.36 @@ -68,14 +69,6 @@ subdir-clean-%:
    1.37  subdir-install-%:
    1.38  	$(MAKE) -C $* install
    1.39  
    1.40 -.PHONY: check
    1.41 -check:
    1.42 -	$(MAKE) -C check
    1.43 -
    1.44 -.PHONY: check_clean
    1.45 -check_clean:
    1.46 -	$(MAKE) -C check clean
    1.47 -
    1.48  ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
    1.49  IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \
    1.50  			 --interp-prefix=$(CROSS_SYS_ROOT)
     2.1 --- a/tools/check/Makefile	Sat Jan 26 15:26:55 2008 +0000
     2.2 +++ b/tools/check/Makefile	Sat Jan 26 15:27:18 2008 +0000
     2.3 @@ -1,20 +1,17 @@
     2.4  XEN_ROOT = ../..
     2.5  include $(XEN_ROOT)/tools/Rules.mk
     2.6  
     2.7 -.PHONY: all
     2.8 -all: build
     2.9 +.PHONY: all install
    2.10 +all install: check-build
    2.11  
    2.12  # Check this machine is OK for building on.
    2.13 -.PHONY: build
    2.14 -build:
    2.15 +.PHONY: check-build
    2.16 +check-build:
    2.17  	LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) ./chk build
    2.18  
    2.19  # Check this machine is OK for installing on.
    2.20 -# DO NOT use this check from 'make install' in the parent
    2.21 -# directory, as that target can be used to make an installable
    2.22 -# copy rather than actually installing.
    2.23 -.PHONY: install
    2.24 -install:
    2.25 +.PHONY: check-install
    2.26 +check-install:
    2.27  	LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) ./chk install
    2.28  
    2.29  .PHONY: clean