build: start building the tools with the main makefiles

This will make out-of-tree build easier.

Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/Makefile b/xen/Makefile
index c95655b502149bfa399cbde418a273d32793321a..0fb1e737f2b959aa30974fff9316215d4598579f 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -209,7 +209,7 @@ endif # root-make-done
 
 PHONY += tools_fixdep
 tools_fixdep:
-       $(MAKE) -C tools fixdep
+       $(Q)$(MAKE) $(build)=tools tools/fixdep
 
 ifeq ($(config-build),y)
 # ===========================================================================
@@ -247,7 +247,7 @@ ifeq ($(need-config),y)
 # "tools_fixdep" which is a .PHONY target and would force make to call
 # "defconfig" again to update $(KCONFIG_CONFIG).
 tools/fixdep:
-       $(MAKE) -C tools fixdep
+       $(Q)$(MAKE) $(build)=tools tools/fixdep
 
 # Allow people to just run `make` as before and not force them to configure
 $(KCONFIG_CONFIG): tools/fixdep
@@ -406,7 +406,7 @@ _debug:
 
 .PHONY: _clean
 _clean:
-       $(MAKE) -C tools clean
+       $(MAKE) $(clean) tools
        $(MAKE) $(clean) include
        $(MAKE) $(clean) common
        $(MAKE) $(clean) drivers
@@ -435,7 +435,7 @@ $(TARGET).gz: $(TARGET)
        mv $@.new $@
 
 $(TARGET): FORCE
-       $(MAKE) -C tools
+       $(Q)$(MAKE) $(build)=tools
        $(Q)$(MAKE) $(build)=. include/xen/compile.h
        [ -e arch/$(TARGET_ARCH)/efi ] && for f in $$(cd common/efi; echo *.[ch]); \
                do test -r arch/$(TARGET_ARCH)/efi/$$f || \

diff --git a/xen/tools/Makefile b/xen/tools/Makefile
index 722f3664549d706757cdf24e6039d1d73e7cc86e..a5078b7cb8de60b3b65686a9c8f7374882ef2b5d 100644 (file)
--- a/xen/tools/Makefile
+++ b/xen/tools/Makefile
@@ -1,15 +1,2 @@
-
-include $(XEN_ROOT)/Config.mk
-
-.PHONY: default
-default: symbols fixdep
-
-.PHONY: clean
-clean:
-       rm -f *.o symbols fixdep
-
-symbols: symbols.c
-       $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
-
-fixdep: fixdep.c
-       $(HOSTCC) $(HOSTCFLAGS) -o $@ $<
+hostprogs-always-y += symbols
+hostprogs-always-y += fixdep