tools/include: adjust population of acpi/

Limit what gets exposed - in particular cpufreq/ and apei.h are
hypervisor private headers which the tool stack building shouldn't see
or use. Also don't pass -f to ln, to allow noticing name collisions
right away.

Additionally acpi/ also has been in need of deleting at the start of
the rule, or alternatively the respective ln would have needed to also
be passed -n.

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 3d0192fbadcb228e2bc177d4260ff6f4eac8c049..35623cd70a608d5fff991bca57d14bb4e54626d1 100644 (file)
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -16,15 +16,16 @@ 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: $(XEN_PUBLIC_INCLUDES) $(XEN_LIB_X86_INCLUDES)
-       @rm -rf xen
-       mkdir -p xen/libelf
+       @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 -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
-       ln -sf $(XEN_ROOT)/xen/include/acpi acpi
+       ln -s $(XEN_ROOT)/xen/include/acpi/platform acpi/
+       ln -s $(XEN_ROOT)/xen/include/acpi/ac*.h acpi/
 ifeq ($(CONFIG_X86),y)
        ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm
        mkdir -p xen/lib/x86