[Mesa-dev] [PATCH 2/2] rbug: update the READMEs to reflect the import of rbug-gui

[Emil Velikov]

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/auxiliary/rbug/README     |  2 +-
 src/gallium/docs/source/debugging.rst |  4 ++--
 src/gallium/docs/source/distro.rst    |  2 +-
 src/gallium/drivers/rbug/README       |  5 ++---
 src/gallium/tools/rbug-gui/README     | 28 +++++++++-------------------
 5 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/gallium/auxiliary/rbug/README b/src/gallium/auxiliary/rbug/README
index c515643..0fe172a 100644
--- a/src/gallium/auxiliary/rbug/README
+++ b/src/gallium/auxiliary/rbug/README
@@ -18,7 +18,7 @@ progs/rbug/README
 
 for a GUI see:
 
-  http://cgit.freedesktop.org/mesa/rbug-gui
+src/gallium/tools/rbug-gui
 
 
 --
diff --git a/src/gallium/docs/source/debugging.rst b/src/gallium/docs/source/debugging.rst
index 8566dbd..e38a700 100644
--- a/src/gallium/docs/source/debugging.rst
+++ b/src/gallium/docs/source/debugging.rst
@@ -104,6 +104,6 @@ Remote Debugger
 
 The remote debugger, commonly known as rbug, allows for runtime inspections of
 :ref:`Context`, :ref:`Screen`, :ref:`Resource` and :ref:`Shader` objects; and
-pausing and stepping of :ref:`Draw` calls. Is used with rbug-gui which is
-hosted outside of the main mesa repository. rbug is can be used over a network
+pausing and stepping of :ref:`Draw` calls. It is used with rbug-gui which is
+localted in src/gallium/tools/rbug-gui. rbug can be used over a network
 connection, so the debugger does not need to be on the same machine.
diff --git a/src/gallium/docs/source/distro.rst b/src/gallium/docs/source/distro.rst
index 000b031..bf97033 100644
--- a/src/gallium/docs/source/distro.rst
+++ b/src/gallium/docs/source/distro.rst
@@ -83,7 +83,7 @@ Wrapper driver. Trace dumps an XML record of the calls made to the
 Rbug
 ^^^^
 
-Wrapper driver. :ref:`rbug` driver used with stand alone rbug-gui.
+Wrapper driver. :ref:`rbug` driver used with the rbug-gui tool.
 
 .. _galahad:
 
diff --git a/src/gallium/drivers/rbug/README b/src/gallium/drivers/rbug/README
index 0edf0ad..f31bdec 100644
--- a/src/gallium/drivers/rbug/README
+++ b/src/gallium/drivers/rbug/README
@@ -15,9 +15,8 @@ Do
 
 which should open gallium remote debugging session. While the program is running
 you can launch the small remote debugging application from progs/rbug. More
-information is in that directory. Also for a gui see:
-
-   http://cgit.freedesktop.org/mesa/rbug-gui
+information is in that directory. For interactive debugging the GUI is located
+under src/gallium/tools/rbug-gui.
 
 
 = Integrating =
diff --git a/src/gallium/tools/rbug-gui/README b/src/gallium/tools/rbug-gui/README
index 4e6744a..bc583ab 100644
--- a/src/gallium/tools/rbug-gui/README
+++ b/src/gallium/tools/rbug-gui/README
@@ -7,32 +7,20 @@ It is written in C and uses gtk, gtkglext and Gallium.
 
 
 For information about protocol (de)marshaling see:
-$(MESA)/src/gallium/auxiliary/rbug/README
+src/gallium/auxiliary/rbug/README
 
 for information about driver integration look in:
-$(MESA)/src/gallium/drivers/rbug/README
+src/gallium/drivers/rbug/README
 
 
-= Building =
+= Dependencies =
 
-You need to have checked out a mesa repository in a sibling directory to this
-directory called mesa, as currently the build looks for mesa in ../mesa/.
-You also need to build a debug build of mesa with with gallium so that the
-needed library exist:
-
-	$(MESA)/src/gallium/auxiliary/libgallium.a
-
-
-The gtk dependancies should be satisfied on debian based system with:
+The tool uses GTK for its GUI. The dependancies on a Debian based system should
+be satisfied with:
 
 sudo apt-get install libgtk2.0-dev libgtkglext1-dev
 
 
-Then just do:
- ./autogen.sh
- make
-
-
 = Usage =
 
 Make sure that you driver has trace integration, see above. Then from on
@@ -46,8 +34,10 @@ From the debugging computer launch rbug-gui from this folder.
 
 ./rbug-gui [ip|hostname]
 
-If no ip/hostname is give rbug-gui will ask you for a ip and port. You can
-also call "make run" which will connect automaticaly to localhost.
+If no ip/hostname is given rbug-gui will ask you for a ip and port. To connect
+to localhost run
+
+./rbug-gui localhost
 
 
 You should now see the debugger. On the left you have a list of resources
-- 
2.3.1