From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Sat, 27 Sep 2003 14:01:15 +0000 (+0000)
Subject: libraries install dir change, please recompile the whole tree
X-Git-Tag: v0.12.20~3230
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=96cbee09f8701ff8eb088af3ad79b812b3022c8f;p=lttv.git

libraries install dir change, please recompile the whole tree

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

diff --git a/ltt/branches/poly/Makefile.am b/ltt/branches/poly/Makefile.am
index 3a953acd..cf1b609e 100644
--- a/ltt/branches/poly/Makefile.am
+++ b/ltt/branches/poly/Makefile.am
@@ -1,3 +1,5 @@
 # WARNING : ltt must come before lttv, so that the traceread library is
 # up to date
 SUBDIRS = ltt include lttv lttd 
+
+
diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 58b7b4c3..3d9f8761 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -48,7 +48,10 @@ AC_CHECK_FUNCS([select])
 
 #CPPFLAGS="$CPPFLAGS -I"
 
-lttvplugindir="${libdir}/lttv/plugins"
+lttvlibdir="${libdir}/lttv"
+AC_SUBST(lttvlibdir)
+
+lttvplugindir="${lttvlibdir}/plugins"
 AC_SUBST(lttvplugindir)
 
 lttlibdir="${libdir}/ltt"
diff --git a/ltt/branches/poly/lttv/modules/Makefile.am b/ltt/branches/poly/lttv/modules/Makefile.am
index 0dd00c4b..5f83a282 100644
--- a/ltt/branches/poly/lttv/modules/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/Makefile.am
@@ -4,6 +4,7 @@
 # Created by Mathieu Desnoyers on May 6, 2003
 #
 
+# the gui subdir comes first : dependency
 SUBDIRS = gui
 
 AM_CFLAGS = $(GLIB_CFLAGS) 
@@ -13,7 +14,7 @@ LIBS += $(GTK_LIBS) -Lgui/API -lmainWinApi -lcustomBox
 
 libdir = ${lttvplugindir}
 
-lib_LTLIBRARIES = libguiEvents.la libguiControlFlow.la
+lib_LTLIBRARIES = libguiEvents.la # libguiControlFlow.la
 libguiEvents_la_LDFLAGS = -module
 libguiEvents_la_SOURCES = guiEvents.c
 libguiControlFlow_la_LDFLAGS = -module
diff --git a/ltt/branches/poly/lttv/modules/gui/API/Makefile.am b/ltt/branches/poly/lttv/modules/gui/API/Makefile.am
index a31cbc42..2c289792 100644
--- a/ltt/branches/poly/lttv/modules/gui/API/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/API/Makefile.am
@@ -4,7 +4,7 @@
 # Created by Mathieu Desnoyers on May 6, 2003
 #
 
-libdir = ${lttlibdir}
+libdir = ${lttvlibdir}
 
 AM_CFLAGS = $(GLIB_CFLAGS) 
 AM_CFLAGS += $(GTK_CFLAGS)
diff --git a/ltt/branches/poly/lttv/modules/gui/mainWin/src/Makefile.am b/ltt/branches/poly/lttv/modules/gui/mainWin/src/Makefile.am
index a0af4c7b..8e20e83e 100644
--- a/ltt/branches/poly/lttv/modules/gui/mainWin/src/Makefile.am
+++ b/ltt/branches/poly/lttv/modules/gui/mainWin/src/Makefile.am
@@ -11,6 +11,8 @@ INCLUDES = \
 	@PACKAGE_CFLAGS@ \
 	$(DEFAULT_INCLUDES)
 
+libdir = ${lttvplugindir}
+
 #bin_PROGRAMS = mainwin
 lib_LTLIBRARIES = libmainwin.la