X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=README;h=f4093b5d5427160f9e38d81c354d2f1ec53b538e;hp=af6e8648895afcf7d68c9f6e74c1d4adf390ca59;hb=60922cb08cc9fb683c6148da4ff91da8c2c0c4d5;hpb=f10719180ada8b6aec080a8f81aeae1b673edbb8

diff --git a/README b/README
index af6e86488..f4093b5d5 100644
--- a/README
+++ b/README
@@ -5,60 +5,87 @@ Please visit http://lttng.org for more information.
 
 Latest development can be found at:
 
-	* Gitweb :	http://git.lttng.org/lttng-tools.git/
-	* Git :		git://git.lttng.org/lttng-tools.git
+    * Gitweb :  http://git.lttng.org/lttng-tools.git/
+    * Git :     git://git.lttng.org/lttng-tools.git
 
-PREREQUISITES:
+REQUIREMENTS:
 
-	- liburcu
-	  Userspace RCU library, by Mathieu Desnoyers and Paul E. McKenney
-	  
-	  -> Tested with liburcu >= v0.5.4
+    - liburcu
+      Userspace RCU library, by Mathieu Desnoyers and Paul E. McKenney
 
-	  * Debian/Ubuntu package: liburcu-dev
-	  * Git : git://lttng.org/userspace-rcu.git
-	  * Website:  http://lttng.org/urcu
+      -> Tested with liburcu >= v0.6.6
 
-	- libustctl
-	  LTTng user-space tracer control library
+      * Debian/Ubuntu package: liburcu-dev
+      * Git : git://git.lttng.org/userspace-rcu.git
+      * Website:  http://lttng.org/urcu
 
-	  Needed for interaction with that tracer.
+    - libpopt >= 1.13
+      Library for parsing command line parameters
 
-	- liblttctl
-	  LTTng kernel tracer control library
+      * Debian/Ubuntu package: libpopt-dev
+
+For developers using the git tree:
+
+This source tree is based on the autotools suite from GNU to simplify
+portability. Here are some things you should have on your system in order to
+compile the git repository tree :
+
+- GNU autotools (automake >=1.10, autoconf >=2.50, autoheader >=2.50)
+  (make sure your system wide "automake" points to a recent version!)
+- GNU Libtool >=2.2
+  (for more information, go to http://www.gnu.org/software/autoconf/)
+
+If you get the tree from the repository, you will need to use the "bootstrap"
+script in the root of the tree. It calls all the GNU tools needed to prepare the
+tree configuration.
 
-	  Needed for interaction with that tracer.
 
 INSTALLATION INSTRUCTIONS:
 
-  - Download, compile and install liburcu, libuuid, libustctl and liblttctl
-  - In this package's tree, run ./configure.
-  - Run make.
-  - Run make install.
-  - Run ldconfig.
+  - Download, compile and install the prerequisites.
+  Then:
+  $ ./configure
+  $ make
+  $ sudo make install
+  $ sudo ldconfig
 
   If compiling from the git repository, run ./bootstrap before running
   the configure script, to generate it.
 
+USAGE:
+
+Please see doc/quickstart.txt to help you start tracing. You can also use the
+-h/--help command on 'lttng' and all other commands offered in this tool (Ex:
+lttng enable-event -h).
+
 PACKAGE CONTENTS:
 
-	This package contains the following elements:
+    This package contains the following elements:
+
+    - liblttngctl
+      The LTTng tracing control library.
+
+    - liblttng-sessiond-comm
+      The lttng-sessiond communication library. In order to talk with lttng-sessiond,
+      this library must be used.
+
+    - libkernelctl
+      Kernel tracer control and ioctl definitions.
 
-	- liblttngctl
-	  The LTTng trace control library.
+    - liblttng-consumer
+      Library for Kernel and (optionally) UST trace consumer.
 
-	- liblttsessiondcomm
-	  The ltt-sessiond communication library. In order to talk with ltt-sessiond,
-	  thi library must be used.
+    - lttng-consumerd
+      The consumer daemon which uses liblttng-consumer.
 
-	- ltt-sessiond
-	  The LTTng session daemon binary.
+    - lttng-sessiond
+      The LTTng session daemon binary.
 
-	- lttng
-	  The LTTng tracer command line control tool.
+    - lttng
+      The LTTng tracer command line control tool.
 
-	- include
-	  The liblttngctl API header file.
+    - include (lttng.h --> installed in $(includedir)/lttng/lttng.h)
+      The liblttngctl API header file.
 
-	- tests
-	  Various test programs.
+    - tests
+      Various test programs.