[Xen-devel] [PATCH 1 of 2] tools/makefile: [RFC] Group system/architecture specific tools

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

Group the Linux, NetBSD and x86 specific tools together when filling the
SUBDIRS-y list.  This prepares for easier configuration in the following patch.

No functional change.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>

diff -r 3d622e2c7cfb -r 4307d512fb26 tools/Makefile
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -15,22 +15,41 @@ SUBDIRS-y += examples
 SUBDIRS-y += hotplug
 SUBDIRS-y += xentrace
 SUBDIRS-$(CONFIG_XCUTILS) += xcutils
-SUBDIRS-$(CONFIG_X86) += firmware
 SUBDIRS-y += console
 SUBDIRS-y += xenmon
 SUBDIRS-$(VTPM_TOOLS) += vtpm_manager
 SUBDIRS-$(VTPM_TOOLS) += vtpm
 SUBDIRS-y += xenstat
-SUBDIRS-$(CONFIG_Linux) += $(SUBDIRS-libaio)
-SUBDIRS-$(CONFIG_Linux) += memshr 
-SUBDIRS-$(CONFIG_Linux) += blktap
-SUBDIRS-$(CONFIG_Linux) += blktap2
-SUBDIRS-$(CONFIG_NetBSD) += $(SUBDIRS-libaio)
-SUBDIRS-$(CONFIG_NetBSD) += blktap2
-SUBDIRS-$(CONFIG_NetBSD) += xenbackendd
 SUBDIRS-y += libfsimage
 SUBDIRS-$(LIBXENAPI_BINDINGS) += libxen
-SUBDIRS-$(CONFIG_Linux) += libvchan
+SUBDIRS-y += xenpmd
+SUBDIRS-y += libxl
+SUBDIRS-y += remus
+SUBDIRS-$(CONFIG_TESTS) += tests
+
+# Linux specific tools
+ifeq ($(CONFIG_Linux),y)
+SUBDIRS-y += $(SUBDIRS-libaio)
+SUBDIRS-y += memshr
+SUBDIRS-y += blktap
+SUBDIRS-y += blktap2
+SUBDIRS-y += libvchan
+endif
+
+# NetBSD specific tools
+ifeq ($(CONFIG_NetBSD),y)
+SUBDIRS-y += $(SUBDIRS-libaio)
+SUBDIRS-y += blktap2
+SUBDIRS-y += xenbackendd
+endif
+
+# x86 specific tools
+ifeq ($(CONFIG_X86),y)
+SUBDIRS-y += firmware
+SUBDIRS-y += xenpaging
+SUBDIRS-y += debugger/gdbsx
+SUBDIRS-y += debugger/kdd
+endif
 
 # do not recurse in to a dir we are about to delete
 ifneq "$(MAKECMDGOALS)" "distclean"
@@ -38,13 +57,6 @@ SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-trad
 SUBDIRS-$(CONFIG_IOEMU) += qemu-xen-dir
 endif
 
-SUBDIRS-y += xenpmd
-SUBDIRS-y += libxl
-SUBDIRS-y += remus
-SUBDIRS-$(CONFIG_X86) += xenpaging
-SUBDIRS-$(CONFIG_X86) += debugger/gdbsx
-SUBDIRS-$(CONFIG_X86) += debugger/kdd
-SUBDIRS-$(CONFIG_TESTS) += tests
 
 # These don't cross-compile
 ifeq ($(XEN_COMPILE_ARCH),$(XEN_TARGET_ARCH))

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel