aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIan Campbell <ian.campbell@citrix.com>2012-05-14 17:15:36 +0100
committerIan Campbell <ian.campbell@citrix.com>2012-05-14 17:15:36 +0100
commitdebddaa56c84f5809774f34fdd190bc5f4a6cf16 (patch)
treeda59df5612d82de5a163d67c7f9e4b3d86d84fe3 /Makefile
parent633979eeb74ecf9200a2f86eff9ed3f09c12bea9 (diff)
downloadxen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.tar.gz
xen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.tar.bz2
xen-debddaa56c84f5809774f34fdd190bc5f4a6cf16.zip
nstore: rename public xenstore headers
The xenstore header xs.h is producing conflicts with other software[1]. xs is a too short identifier and does not matche the library. Renaming the headers to xenstore.h and xenstore_lib.h is the easiest way to make them easy recognizable and prevent furthe problems. [1]: http://bugs.debian.org/668550 [ Also update QEMU_TAG, to bring in corresponding change to qemu-xen-traditional. -iwj ] Signed-off-by: Bastian Blank <waldi@debian.org> Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com> --HG-- rename : tools/xenstore/xs.h => tools/xenstore/xenstore.h rename : tools/xenstore/xs_lib.h => tools/xenstore/xenstore_lib.h
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 67f61821f3..79ebe1caa2 100644
--- a/Makefile
+++ b/Makefile
@@ -241,6 +241,8 @@ uninstall:
rm -rf $(D)$(BINDIR)/xenpvnetboot $(D)$(BINDIR)/qemu-*-xen
rm -rf $(D)$(INCLUDEDIR)/xenctrl* $(D)$(INCLUDEDIR)/xenguest.h
rm -rf $(D)$(INCLUDEDIR)/xs_lib.h $(D)$(INCLUDEDIR)/xs.h
+ rm -rf $(D)$(INCLUDEDIR)/xenstore-compat/xs_lib.h $(D)$(INCLUDEDIR)/xensotre-compat/xs.h
+ rm -rf $(D)$(INCLUDEDIR)/xenstore_lib.h $(D)$(INCLUDEDIR)/xenstore.h
rm -rf $(D)$(INCLUDEDIR)/xen
rm -rf $(D)$(INCLUDEDIR)/_libxl* $(D)$(INCLUDEDIR)/libxl*
rm -rf $(D)$(INCLUDEDIR)/xenstat.h $(D)$(INCLUDEDIR)/xentoollog.h