# HG changeset patch # User Bastian Blank <waldi@debian.org> # Date 1201359991 -3600 # Node ID e91a9eaaeb30875d5703f8b7dc62c6560edc2c03 # Parent b3a70b37e377e44630ebbc688afbf9431dc9953d Add check to subdirs. Also make sure that the install target don''t longer call the install check. Signed-off-by: Bastian Blank <waldi@debian.org> diff -r b3a70b37e377 -r e91a9eaaeb30 tools/Makefile --- a/tools/Makefile Sat Jan 26 16:06:31 2008 +0100 +++ b/tools/Makefile Sat Jan 26 16:06:31 2008 +0100 @@ -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 b3a70b37e377 -r e91a9eaaeb30 tools/check/Makefile --- a/tools/check/Makefile Sat Jan 26 16:06:31 2008 +0100 +++ b/tools/check/Makefile Sat Jan 26 16:06:31 2008 +0100 @@ -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-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel