Having /usr/bin/xsls conflicts with xsls as distributed in scalapack

(http://www.netlib.org/scalapack/).  It should probably be xenstore-ls
a) for namespacing and b) to match up with the other xenstore commands
better.

Signed-off-by: Jeremy Katz <katzj@redhat.com>

diff --git a/.hgignore b/.hgignore
index 9a52e9ce12b8c9e1536f4c9e0740527a649acadc..f867e970e1c278cf1b661a1002dcc66387887abf 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -163,6 +163,7 @@
 ^tools/xenstore/xenstore-read$
 ^tools/xenstore/xenstore-rm$
 ^tools/xenstore/xenstore-write$
+^tools/xenstore/xenstore-ls$
 ^tools/xenstore/xenstored$
 ^tools/xenstore/xenstored_test$
 ^tools/xenstore/xs_crashme$
@@ -171,7 +172,6 @@
 ^tools/xenstore/xs_tdb_dump$
 ^tools/xenstore/xs_test$
 ^tools/xenstore/xs_watch_stress$
-^tools/xenstore/xsls$
 ^tools/xentrace/setsize$
 ^tools/xentrace/tbctl$
 ^tools/xentrace/xenctx$

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index 7b56ad497b04a5596d72dbc2a1d94b57004b8fb6..a6ba3ee2dc56f3ebf7e3d3724ace772e57fcd6cb 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -27,7 +27,7 @@ CLIENTS := xenstore-exists xenstore-list xenstore-read xenstore-rm
 CLIENTS += xenstore-write
 CLIENTS_OBJS := $(patsubst xenstore-%,xenstore_%.o,$(CLIENTS))
 
-all: libxenstore.so xenstored $(CLIENTS) xs_tdb_dump xsls
+all: libxenstore.so xenstored $(CLIENTS) xs_tdb_dump xenstore-ls
 
 testcode: xs_test xenstored_test xs_random
 
@@ -40,7 +40,7 @@ $(CLIENTS): xenstore-%: xenstore_%.o libxenstore.so
 $(CLIENTS_OBJS): xenstore_%.o: xenstore_client.c
        $(COMPILE.c) -DCLIENT_$(*F) -o $@ $<
 
-xsls: xsls.o libxenstore.so
+xenstore-ls: xsls.o libxenstore.so
        $(LINK.o) $< $(LOADLIBES) $(LDLIBS) -lxenctrl -L. -lxenstore -o $@
 
 xenstored_test: xenstored_core_test.o xenstored_watch_test.o xenstored_domain_test.o xenstored_transaction_test.o xs_lib.o talloc_test.o fake_libxc.o utils.o tdb.o
@@ -77,7 +77,7 @@ libxenstore.so: xs.opic xs_lib.opic
 clean: testsuite-clean
        rm -f *.o *.opic *.so
        rm -f xenstored xs_random xs_stress xs_crashme
-       rm -f xs_test xenstored_test xs_tdb_dump xsls $(CLIENTS)
+       rm -f xs_test xenstored_test xs_tdb_dump xenstore-ls $(CLIENTS)
        $(RM) $(PROG_DEP)
 
 print-dir:
@@ -129,7 +129,7 @@ TAGS:
 tarball: clean
        cd .. && tar -c -j -v -h -f xenstore.tar.bz2 xenstore/
 
-install: libxenstore.so xenstored xsls $(CLIENTS)
+install: libxenstore.so xenstored xenstore-ls $(CLIENTS)
        $(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
        $(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
        $(INSTALL_DIR) -p $(DESTDIR)/usr/bin
@@ -137,7 +137,7 @@ install: libxenstore.so xenstored xsls $(CLIENTS)
        $(INSTALL_DIR) -p $(DESTDIR)/usr/include
        $(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
        $(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
-       $(INSTALL_PROG) xsls $(DESTDIR)/usr/bin
+       $(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
        $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
        $(INSTALL_DATA) xs.h $(DESTDIR)/usr/include