From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Wed, 21 Sep 2005 17:12:09 +0000 (+0000)
Subject: change traceread install lib path
X-Git-Tag: v0.12.20~2241
X-Git-Url: http://git.lttng.org./?a=commitdiff_plain;h=6da3640c5dfff6319edcb000391cb2fdfa5abe56;hp=6b5ad30001faf1f165eff14919462c009f1546ad;p=lttv.git

change traceread install lib path

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

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 9f0b2402..670d5d84 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -77,9 +77,9 @@ AC_CHECK_FUNCS([select])
 #CPPFLAGS="$CPPFLAGS -I"
 
 AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes)
-lttvlibdir="${libdir}/lttv"
+#lttvlibdir="${libdir}/lttv"
 lttvplugindir="${lttvlibdir}/plugins"
-lttlibdir="${libdir}/ltt"
+#lttlibdir="${libdir}/ltt"
 top_lttvdir="\$(top_srcdir)/lttv"
 top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
 
@@ -95,9 +95,9 @@ lttctlincludedir="${includedir}/liblttctl"
 
 AC_SUBST(POPT_LIBS)
 AC_SUBST(UTIL_LIBS)
-AC_SUBST(lttvlibdir)
+#AC_SUBST(lttvlibdir)
 AC_SUBST(lttvplugindir)
-AC_SUBST(lttlibdir)
+#AC_SUBST(lttlibdir)
 AC_SUBST(top_lttvdir)
 AC_SUBST(top_lttvwindowdir)
 AC_SUBST(DEFAULT_INCLUDES)
diff --git a/ltt/branches/poly/ltt/Makefile.am b/ltt/branches/poly/ltt/Makefile.am
index a4fb77e0..e6d6aa12 100644
--- a/ltt/branches/poly/ltt/Makefile.am
+++ b/ltt/branches/poly/ltt/Makefile.am
@@ -4,13 +4,13 @@
 # Created by Mathieu Desnoyers on May 6, 2003
 #
 
-libdir = ${lttlibdir}
+#libdir = ${lttlibdir}
 
 AM_CFLAGS = $(GLIB_CFLAGS) 
 LIBS += $(GLIB_LIBS)
 
-lib_LTLIBRARIES = libtraceread.la
-libtraceread_la_SOURCES = event.c facility.c parser.c tracefile.c type.c
+lib_LTLIBRARIES = liblttvtraceread.la
+liblttvtraceread_la_SOURCES = event.c facility.c parser.c tracefile.c type.c
 noinst_HEADERS = parser.h ltt-private.h
 
 lttinclude_HEADERS = \
diff --git a/ltt/branches/poly/lttv/lttv/Makefile.am b/ltt/branches/poly/lttv/lttv/Makefile.am
index 961551d9..86bca39c 100644
--- a/ltt/branches/poly/lttv/lttv/Makefile.am
+++ b/ltt/branches/poly/lttv/lttv/Makefile.am
@@ -1,6 +1,6 @@
 AM_CFLAGS = $(GLIB_CFLAGS) 
-#LIBS += $(POPT_LIBS) $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread
-LIBS += $(POPT_LIBS) $(GLIB_LIBS) -lgobject-2.0 -L${top_srcdir}/ltt -ltraceread
+LIBS += $(POPT_LIBS) $(GLIB_LIBS) -lgobject-2.0 -L${top_srcdir}/ltt\
+          -llttvtraceread
 
 bin_PROGRAMS = lttv.real
 
diff --git a/ltt/branches/poly/lttv/modules/text/Makefile.am b/ltt/branches/poly/lttv/modules/text/Makefile.am
index 2f937a1e..e65919e5 100644
--- a/ltt/branches/poly/lttv/modules/text/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/text/Makefile.am
@@ -1,8 +1,7 @@
 
 
 AM_CFLAGS = $(GLIB_CFLAGS) 
-#LIBS += $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread
-LIBS += $(GLIB_LIBS) -lgobject-2.0 -L${top_srcdir}/ltt -ltraceread
+LIBS += $(GLIB_LIBS) -lgobject-2.0 -L${top_srcdir}/ltt -llttvtraceread
 
 libdir = ${lttvplugindir}