tools: Handle existing link to acpi directory

The link to acpi include directory is not removed by Makefile's 'clean'
target. This can lead to make failure when making xen/.dir target if
we try to create the link again.

We can prevent this failure by (1) removing acpi link when cleaning up
and (2) adding '-f' option to 'ln' (just like we do for other targets).

We should also add tools/include/acpi link to .gitignore.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Wei Liu <wei.liu2@citrix.com>

diff --git a/.gitignore b/.gitignore
index 4adeedb11cdcb8652baf37d7354525032f47331b..6e5955e47024ab0ab1e2ae72bebf23b2505c0f2e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -168,6 +168,7 @@ tools/hotplug/Linux/xen-hotplug-common.sh
 tools/hotplug/Linux/xendomains
 tools/hotplug/NetBSD/rc.d/xencommons
 tools/hotplug/NetBSD/rc.d/xendriverdomain
+tools/include/acpi
 tools/include/xen/*
 tools/include/xen-xsm/*
 tools/include/xen-foreign/*.(c|h|size)

diff --git a/tools/include/Makefile b/tools/include/Makefile
index d95d8375ba78ba3a58b0e0423423a1788e10c28c..f1af91c1298011043bbc7c00155d12681b76129a 100644 (file)
--- a/tools/include/Makefile
+++ b/tools/include/Makefile
@@ -20,7 +20,7 @@ xen/.dir:
        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 -s $(XEN_ROOT)/xen/include/acpi acpi
+       ln -sf $(XEN_ROOT)/xen/include/acpi acpi
        touch $@
 
 # Not xen/xsm as that clashes with link to
@@ -60,7 +60,7 @@ install: all
 
 .PHONY: clean
 clean:
-       rm -rf xen xen-xsm
+       rm -rf xen xen-xsm acpi
        $(MAKE) -C xen-foreign clean