From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Sat, 11 Mar 2006 17:39:54 +0000 (+0000)
Subject: update build
X-Git-Tag: v0.12.20~1802
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=2c0d8f7613f3c88766412a2d03e3477de4b1db02;hp=4a89deea80bc8f79cefc4a3a5219fd55f37f1416;p=lttv.git

update build

git-svn-id: http://ltt.polymtl.ca/svn@1687 04897980-b3bd-0310-b5e0-8ef037075253
---

diff --git a/ltt/branches/poly/Makefile.am b/ltt/branches/poly/Makefile.am
index 66afa906..4f542dcf 100644
--- a/ltt/branches/poly/Makefile.am
+++ b/ltt/branches/poly/Makefile.am
@@ -1,6 +1,6 @@
 # WARNING : ltt must come before lttv, so that the traceread library is
 # up to date
 
-SUBDIRS = liblttctl ltt lttctl lttv lttd doc facilities
+SUBDIRS = ltt lttv doc
 
 EXTRA_DIST = QUICKSTART
diff --git a/ltt/branches/poly/README b/ltt/branches/poly/README
index 836472ad..55ac5557 100644
--- a/ltt/branches/poly/README
+++ b/ltt/branches/poly/README
@@ -1,7 +1,6 @@
 
 This package contains the trace reading library and trace viewing tools for
-the new Linux Trace Toolkit trace format. It also contains the lttd, lttctl and
-liblttctl programs which are necessary to obtain a trace.
+the new Linux Trace Toolkit trace format.
 
 * Compiling
 
@@ -49,9 +48,6 @@ debian: debian config files (currently empty).
 doc:    Documentation.
 doc/user:      User related documentation.
 doc/developer: Developer related documentation.
-liblttctl:    Library to communicate with the kernel tracer control module.
-lttctl:       Command line program to use the liblttctl library.
-lttd:   Linux Trace Toolkit daemon.
 lttv:   Linux Trace Toolkit trace analysis tool and viewer.
 lttv/modules:  Linux Trace Toolkit analysis tool and viewer plugin modules.
 specs:  RPM config files (currently empty).
diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index b9b8c831..f17d60eb 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -47,7 +47,7 @@ required in order to compile LinuxTraceToolkit]))
 
 
 # pthread for lttd
-AC_CHECK_LIB(pthread, pthread_join,[THREAD_LIBS="-lpthread"], AC_MSG_ERROR([LinuxThreads is required in order to compile lttd]))
+#AC_CHECK_LIB(pthread, pthread_join,[THREAD_LIBS="-lpthread"], AC_MSG_ERROR([LinuxThreads is required in order to compile lttd]))
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -112,8 +112,6 @@ AC_SUBST(lttvwindowincludedir)
 AC_SUBST(lttctlincludedir)
 
 AC_CONFIG_FILES([Makefile
-     liblttctl/Makefile
-     lttctl/Makefile
 		 lttv/Makefile
 		 lttv/lttv/Makefile
 		 lttv/modules/Makefile
@@ -129,7 +127,6 @@ AC_CONFIG_FILES([Makefile
 		 lttv/modules/gui/statistics/Makefile
      lttv/modules/gui/filter/Makefile
      lttv/modules/gui/tracecontrol/Makefile
-		 lttd/Makefile
 		 ltt/Makefile
      doc/Makefile
      doc/developer/Makefile
@@ -139,6 +136,5 @@ AC_CONFIG_FILES([Makefile
      doc/user/Makefile
      doc/user/user_guide/Makefile
      doc/user/user_guide/docbook/Makefile
-     doc/user/user_guide/html/Makefile
-     facilities/Makefile])
+     doc/user/user_guide/html/Makefile])
 AC_OUTPUT