From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 2 Apr 2012 20:48:26 +0000 (-0400)
Subject: Disable ltttraceread library build
X-Git-Tag: v1.5-beta1~76
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=1111bb0f69e3c01c9264b19cbc7d2a8a02eeb569;p=lttv.git

Disable ltttraceread library build

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/Makefile.am b/Makefile.am
index fd556a5a..89c23b15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,5 @@
 ACLOCAL_AMFLAGS = -I config
 
-# WARNING : ltt must come before lttv, so that the traceread library is
-# up to date
-
-if BUILD_LIB_ONLY
-SUBDIRS = ltt doc
-else
 SUBDIRS = ltt lttv doc
-endif
 
 EXTRA_DIST = LTTngManual.html
diff --git a/configure.ac b/configure.ac
index e93c13cc..e1d04d05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,19 +29,6 @@ AM_SILENT_RULES([yes])
 AC_CONFIG_HEADERS([config.h])
 LT_INIT
 
-# If requested, only build the ltt trace reading library
-AC_ARG_WITH(lttv,
-	AS_HELP_STRING([--with-lttv],
-	[build whole LTTV system, as opposd to only the trace reading library [[default=yes]]]),
-	[with_lttv="$withval"],
-	[with_lttv="yes"])
-
-# If we've requested the lib only, turn off the lttv-gui building as well
-AS_IF([test "x$with_lttv" = "xno"], [with_lttv_gui="no"])
-
-AM_CONDITIONAL([BUILD_LIB_ONLY], [ test "x$with_lttv" = "xno" ])
-
-
 # If requested, avoid building LTTV part
 AC_ARG_WITH(lttv-gui,
 	AS_HELP_STRING([--with-lttv-gui],
@@ -182,6 +169,8 @@ AC_SUBST(lttvincludedir)
 AC_SUBST(lttvwindowincludedir)
 AC_SUBST(lttctlincludedir)
 
+#	ltt/Makefile
+
 AC_CONFIG_FILES([Makefile
 	lttv/Makefile
 	lttv/lttv/Makefile
@@ -200,7 +189,6 @@ AC_CONFIG_FILES([Makefile
 	lttv/modules/gui/filter/Makefile
 	lttv/modules/gui/tracecontrol/Makefile
 	lttv/modules/gui/resourceview/Makefile
-	ltt/Makefile
 	doc/Makefile
 	doc/developer/Makefile
 	doc/developer/developer_guide/Makefile