[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] Having /usr/bin/xsls conflicts with xsls as distributed in scalapack
# HG changeset patch # User kaf24@xxxxxxxxxxxxxxxxxxxx # Node ID e32258567d055196efc3de2dd1802d50449cb297 # Parent b29954d81e6df0040c25c7e59d508c9433e767b0 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@xxxxxxxxxx> diff -r b29954d81e6d -r e32258567d05 .hgignore --- a/.hgignore Thu Jan 19 08:12:40 2006 +++ b/.hgignore Thu Jan 19 08:16:01 2006 @@ -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 -r b29954d81e6d -r e32258567d05 tools/xenstore/Makefile --- a/tools/xenstore/Makefile Thu Jan 19 08:12:40 2006 +++ b/tools/xenstore/Makefile Thu Jan 19 08:16:01 2006 @@ -27,7 +27,7 @@ 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_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 @@ 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 @@ 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_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 _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |