--- xen-unstable/tools/Makefile	2005-03-24 22:16:33.000000000 -0600
+++ xen-unstable.work/tools/Makefile	2005-03-25 10:59:12.000000000 -0600
@@ -1,37 +1,36 @@
+XEN_ROOT = ../
+include $(XEN_ROOT)/tools/Rules.mk
 
-all:	
-	$(MAKE) -C check
-	$(MAKE) -C libxutil
-	$(MAKE) -C libxc
-	$(MAKE) -C misc
-	$(MAKE) -C examples
-	$(MAKE) -C xentrace
-	$(MAKE) -C python
-	$(MAKE) -C xfrd
-	$(MAKE) -C xcs
-	$(MAKE) -C ioemu
+SUBDIRS :=
+SUBDIRS += libxutil
+SUBDIRS += libxc
+SUBDIRS += misc
+SUBDIRS += examples
+SUBDIRS += xentrace
+SUBDIRS += python
+SUBDIRS += xfrd
+SUBDIRS += xcs
+SUBDIRS += ioemu
+
+.PHONY: all install clean check check_clean
+
+all: check
+	@for subdir in $(SUBDIRS); do \
+		$(MAKE) -C $$subdir $@ || exit -1; \
+	done
 
-install: 
+install: check
+	@for subdir in $(SUBDIRS); do \
+		$(MAKE) -C $$subdir $@ || exit -1; \
+	done
+
+clean: check_clean
+	@for subdir in $(SUBDIRS); do \
+		$(MAKE) -C $$subdir $@ || exit -1; \
+	done
+
+check:
 	$(MAKE) -C check
-	$(MAKE) -C libxutil install
-	$(MAKE) -C libxc install
-	$(MAKE) -C misc install
-	$(MAKE) -C examples install
-	$(MAKE) -C xentrace install
-	$(MAKE) -C python install
-	$(MAKE) -C xfrd install
-	$(MAKE) -C sv install
-	$(MAKE) -C xcs install
-	$(MAKE) -C ioemu install
-
-clean build:
-	$(MAKE) -C check $@
-	$(MAKE) -C libxutil $@
-	$(MAKE) -C libxc $@
-	$(MAKE) -C misc $@
-	$(MAKE) -C examples $@
-	$(MAKE) -C xentrace $@
-	$(MAKE) -C python $@
-	$(MAKE) -C xfrd $@
-	$(MAKE) -C xcs clean
-	$(MAKE) -C ioemu clean
+
+check_clean:
+	$(MAKE) -C check clean