ia64/xen-unstable

changeset 8630:e32258567d05

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>
author kaf24@firebug.cl.cam.ac.uk
date Thu Jan 19 09:16:01 2006 +0100 (2006-01-19)
parents b29954d81e6d
children 8a3549172896
files .hgignore tools/xenstore/Makefile
line diff
     1.1 --- a/.hgignore	Thu Jan 19 09:12:40 2006 +0100
     1.2 +++ b/.hgignore	Thu Jan 19 09:16:01 2006 +0100
     1.3 @@ -163,6 +163,7 @@
     1.4  ^tools/xenstore/xenstore-read$
     1.5  ^tools/xenstore/xenstore-rm$
     1.6  ^tools/xenstore/xenstore-write$
     1.7 +^tools/xenstore/xenstore-ls$
     1.8  ^tools/xenstore/xenstored$
     1.9  ^tools/xenstore/xenstored_test$
    1.10  ^tools/xenstore/xs_crashme$
    1.11 @@ -171,7 +172,6 @@
    1.12  ^tools/xenstore/xs_tdb_dump$
    1.13  ^tools/xenstore/xs_test$
    1.14  ^tools/xenstore/xs_watch_stress$
    1.15 -^tools/xenstore/xsls$
    1.16  ^tools/xentrace/setsize$
    1.17  ^tools/xentrace/tbctl$
    1.18  ^tools/xentrace/xenctx$
     2.1 --- a/tools/xenstore/Makefile	Thu Jan 19 09:12:40 2006 +0100
     2.2 +++ b/tools/xenstore/Makefile	Thu Jan 19 09:16:01 2006 +0100
     2.3 @@ -27,7 +27,7 @@ CLIENTS := xenstore-exists xenstore-list
     2.4  CLIENTS += xenstore-write
     2.5  CLIENTS_OBJS := $(patsubst xenstore-%,xenstore_%.o,$(CLIENTS))
     2.6  
     2.7 -all: libxenstore.so xenstored $(CLIENTS) xs_tdb_dump xsls
     2.8 +all: libxenstore.so xenstored $(CLIENTS) xs_tdb_dump xenstore-ls
     2.9  
    2.10  testcode: xs_test xenstored_test xs_random
    2.11  
    2.12 @@ -40,7 +40,7 @@ xenstored: xenstored_core.o xenstored_wa
    2.13  $(CLIENTS_OBJS): xenstore_%.o: xenstore_client.c
    2.14  	$(COMPILE.c) -DCLIENT_$(*F) -o $@ $<
    2.15  
    2.16 -xsls: xsls.o libxenstore.so
    2.17 +xenstore-ls: xsls.o libxenstore.so
    2.18  	$(LINK.o) $< $(LOADLIBES) $(LDLIBS) -lxenctrl -L. -lxenstore -o $@
    2.19  
    2.20  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
    2.21 @@ -77,7 +77,7 @@ libxenstore.so: xs.opic xs_lib.opic
    2.22  clean: testsuite-clean
    2.23  	rm -f *.o *.opic *.so
    2.24  	rm -f xenstored xs_random xs_stress xs_crashme
    2.25 -	rm -f xs_test xenstored_test xs_tdb_dump xsls $(CLIENTS)
    2.26 +	rm -f xs_test xenstored_test xs_tdb_dump xenstore-ls $(CLIENTS)
    2.27  	$(RM) $(PROG_DEP)
    2.28  
    2.29  print-dir:
    2.30 @@ -129,7 +129,7 @@ TAGS:
    2.31  tarball: clean
    2.32  	cd .. && tar -c -j -v -h -f xenstore.tar.bz2 xenstore/
    2.33  
    2.34 -install: libxenstore.so xenstored xsls $(CLIENTS)
    2.35 +install: libxenstore.so xenstored xenstore-ls $(CLIENTS)
    2.36  	$(INSTALL_DIR) -p $(DESTDIR)/var/run/xenstored
    2.37  	$(INSTALL_DIR) -p $(DESTDIR)/var/lib/xenstored
    2.38  	$(INSTALL_DIR) -p $(DESTDIR)/usr/bin
    2.39 @@ -137,7 +137,7 @@ install: libxenstore.so xenstored xsls $
    2.40  	$(INSTALL_DIR) -p $(DESTDIR)/usr/include
    2.41  	$(INSTALL_PROG) xenstored $(DESTDIR)/usr/sbin
    2.42  	$(INSTALL_PROG) $(CLIENTS) $(DESTDIR)/usr/bin
    2.43 -	$(INSTALL_PROG) xsls $(DESTDIR)/usr/bin
    2.44 +	$(INSTALL_PROG) xenstore-ls $(DESTDIR)/usr/bin
    2.45  	$(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR)
    2.46  	$(INSTALL_DATA) libxenstore.so $(DESTDIR)/usr/$(LIBDIR)
    2.47  	$(INSTALL_DATA) xs.h $(DESTDIR)/usr/include