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>

diff --git a/tools/Makefile b/tools/Makefile
index e28c976359d9dd90b170719bb8ff754477070a0c..acf44fce21fff2f0bccef86d7a1b1a6fdf379297 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,6 +2,7 @@ XEN_ROOT = ../
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y :=
+SUBDIRS-y += check
 SUBDIRS-y += include
 SUBDIRS-y += libxc
 SUBDIRS-y += flask
@@ -36,13 +37,13 @@ export CROSS_SYS_ROOT
 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-clean-%:
 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 --git a/tools/check/Makefile b/tools/check/Makefile
index d7c6808d7ddc85a0caa2409e987a1ba954c122f6..26044721585c40d922c2f0b239491a9d2bddddbf 100644 (file)
--- a/tools/check/Makefile
+++ b/tools/check/Makefile
@@ -1,20 +1,17 @@
 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