[Xen-changelog] [xen-unstable] Add check to subdirs.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201361238 0
# Node ID f4ee7e5793cff3a6b3ed04f3cad9c3df6225da17
# Parent  363a1e84518912c71d2b4dc671c9798ad1a912a9
Add check to subdirs.
Also make sure that the install target doesn't call the install check.

Signed-off-by: Bastian Blank <waldi@xxxxxxxxxx>
---
 tools/Makefile       |   15 ++++-----------
 tools/check/Makefile |   15 ++++++---------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff -r 363a1e845189 -r f4ee7e5793cf tools/Makefile
--- a/tools/Makefile    Sat Jan 26 15:26:55 2008 +0000
+++ b/tools/Makefile    Sat Jan 26 15:27:18 2008 +0000
@@ -2,6 +2,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=
+SUBDIRS-y += check
 SUBDIRS-y += include
 SUBDIRS-y += libxc
 SUBDIRS-y += flask
@@ -36,13 +37,13 @@ endif
 endif
 
 .PHONY: all
-all: check
+all:
        @set -e; for subdir in $(SUBDIRS-y); do \
                $(MAKE) subdir-$@-$$subdir; \
        done
 
 .PHONY: install
-install: check
+install:
        @set -e; for subdir in $(SUBDIRS-y); do \
                $(MAKE) subdir-$@-$$subdir; \
        done
@@ -51,7 +52,7 @@ install: check
        $(INSTALL_DIR) $(DESTDIR)/var/lib/xen
 
 .PHONY: clean
-clean: check_clean
+clean:
        @set -e; for subdir in $(SUBDIRS-y); do \
                $(MAKE) subdir-$@-$$subdir; \
        done
@@ -68,14 +69,6 @@ subdir-install-%:
 subdir-install-%:
        $(MAKE) -C $* install
 
-.PHONY: check
-check:
-       $(MAKE) -C check
-
-.PHONY: check_clean
-check_clean:
-       $(MAKE) -C check clean
-
 ifneq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))
 IOEMU_CONFIGURE_CROSS ?= --cross-prefix=$(CROSS_COMPILE) \
                         --interp-prefix=$(CROSS_SYS_ROOT)
diff -r 363a1e845189 -r f4ee7e5793cf tools/check/Makefile
--- a/tools/check/Makefile      Sat Jan 26 15:26:55 2008 +0000
+++ b/tools/check/Makefile      Sat Jan 26 15:27:18 2008 +0000
@@ -1,20 +1,17 @@ XEN_ROOT = ../..
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-.PHONY: all
-all: build
+.PHONY: all install
+all install: check-build
 
 # Check this machine is OK for building on.
-.PHONY: build
-build:
+.PHONY: check-build
+check-build:
        LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) 
./chk build
 
 # Check this machine is OK for installing on.
-# DO NOT use this check from 'make install' in the parent
-# directory, as that target can be used to make an installable
-# copy rather than actually installing.
-.PHONY: install
-install:
+.PHONY: check-install
+check-install:
        LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) 
./chk install
 
 .PHONY: clean

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