tools/include: adjust population of public headers into xen/

Use a wildcard also for the subdirectories, drop XEN_PUBLIC_INCLUDES for
having a single use only, and don't pass -f to ln to allow noticing name
collisions right away, and add trailing slashes to ln's destination.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Tested-by: Bertrand Marquis <bertrand.marquis@arm.com>
Acked-by: Wei Liu <wl@xen.org>

diff --git a/tools/include/Makefile b/tools/include/Makefile
index ca4464bcc59045d4f9a81fbd403ecce5795ba4e8..ebd5317169490470f25bc3b934142d77ef4e61ca 100644 (file)
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -12,15 +12,14 @@ all-y:
 xen-foreign:
        $(MAKE) -C xen-foreign
 
-XEN_PUBLIC_INCLUDES = $(wildcard $(XEN_ROOT)/xen/include/public/*.h)
 XEN_LIB_X86_INCLUDES = $(filter-out %autogen.h, $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile $(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h))
 
 xen-dir:
        @rm -rf xen acpi
        mkdir -p xen/libelf acpi
-       ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen
-       ln -sf $(XEN_PUBLIC_INCLUDES) xen
-       ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 arch-arm hvm io xsm) xen
+       ln -s $(XEN_ROOT)/xen/include/public/COPYING xen/
+       ln -s $(XEN_ROOT)/xen/include/public/*.h xen/
+       ln -s $(XEN_ROOT)/xen/include/public/*/ xen/
        ln -sf ../xen-sys/$(XEN_OS) xen/sys
        ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xen/libelf/
        ln -s ../xen-foreign xen/foreign