From: compudj Date: Wed, 4 Apr 2007 21:46:33 +0000 (+0000) Subject: I recently checked out a later version of the viewer, and found X-Git-Tag: v0.12.20~1015 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=db53c8db85018da542b1a7ab799462b7a9051ac6;p=lttv.git I recently checked out a later version of the viewer, and found a couple of build paths that cause problems with builds done outside the source directory. Here's a patch: (You can ignore the version numbers in the patch, this applies OK against 0.8.79) I patched both the Makefile.am and Makefile.in files, but obviously if you re-gen the Makefile.in, that part of the patch is redundant. The change is straightforward - it just uses top_builddir in place of top_srcdir for the library path for linking. When building within the source tree, top_builddir is the same as top_srcdir, so this should have no effect for people doing builds the "normal" way. lttv/modules/gui/tutorial/Makefile.am | 2 +- lttv/modules/text/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) git-svn-id: http://ltt.polymtl.ca/svn@2474 04897980-b3bd-0310-b5e0-8ef037075253 --- diff --git a/ltt/branches/poly/lttv/modules/gui/tutorial/Makefile.am b/ltt/branches/poly/lttv/modules/gui/tutorial/Makefile.am index ea3fb172..89446d09 100644 --- a/ltt/branches/poly/lttv/modules/gui/tutorial/Makefile.am +++ b/ltt/branches/poly/lttv/modules/gui/tutorial/Makefile.am @@ -26,7 +26,7 @@ AM_CFLAGS = $(GLIB_CFLAGS) AM_CFLAGS += $(GTK_CFLAGS) LIBS += $(GLIB_LIBS) -LIBS += $(GTK_LIBS) -L${top_srcdir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow +LIBS += $(GTK_LIBS) -L${top_builddir}/lttv/modules/gui/lttvwindow/lttvwindow -llttvwindow libdir = ${lttvplugindir} diff --git a/ltt/branches/poly/lttv/modules/text/Makefile.am b/ltt/branches/poly/lttv/modules/text/Makefile.am index 2afd92e2..9971ef80 100644 --- a/ltt/branches/poly/lttv/modules/text/Makefile.am +++ b/ltt/branches/poly/lttv/modules/text/Makefile.am @@ -1,5 +1,5 @@ AM_CFLAGS = $(GLIB_CFLAGS) -LIBS += $(GLIB_LIBS) -lgobject-2.0 -L${top_srcdir}/ltt -llttvtraceread +LIBS += $(GLIB_LIBS) -lgobject-2.0 -L${top_builddir}/ltt -llttvtraceread libdir = ${lttvplugindir}