X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2FMakefile.am;h=8364876199bbefeb52f37dec63a892655fbf4806;hb=d888c9c8f4c3e7b4e1516fca135b5be62f7aeea3;hp=0b603eaf54a4f1b3d93a6f54729d104cd97f62c7;hpb=ba576a781d5a1020ff7202ac9a959c9f4a0c7a4c;p=lttv.git

diff --git a/ltt/branches/poly/lttv/Makefile.am b/ltt/branches/poly/lttv/Makefile.am
index 0b603eaf..83648761 100644
--- a/ltt/branches/poly/lttv/Makefile.am
+++ b/ltt/branches/poly/lttv/Makefile.am
@@ -1,7 +1,6 @@
-SUBDIRS = modules
-
 AM_CFLAGS = $(GLIB_CFLAGS) 
-LIBS += $(GLIB_LIBS) -lgobject-2.0 -lltt
+LIBS += $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread
+#LIBS += $(GLIB_LIBS) -lgobject-2.0 -lltt
 
 bin_PROGRAMS = lttv
 
@@ -12,15 +11,15 @@ bin_PROGRAMS = lttv
 lttv_SOURCES = main.c module.c option.c hook.c attribute.c \
 		iattribute.c processTrace.c state.c traceset.c
 
-#lttv_DEPENDENCIES = $(DEFAULT_INCLUDES)/lttv/lttv.h \
-#	$(DEFAULT_INCLUDES)/lttv/module.h \
-#	$(DEFAULT_INCLUDES)/lttv/option.h \
-#	$(DEFAULT_INCLUDES)/lttv/hook.h \
-#	$(DEFAULT_INCLUDES)/lttv/attribute.h \
-#	$(DEFAULT_INCLUDES)/lttv/iattribute.h \
-#	$(DEFAULT_INCLUDES)/lttv/processTrace.h \
-#	$(DEFAULT_INCLUDES)/lttv/state.h \
-#	$(DEFAULT_INCLUDES)/lttv/traceset.h
+lttv_DEPENDENCIES = $(top_includedir)/lttv/lttv.h \
+	$(top_includedir)/lttv/module.h \
+	$(top_includedir)/lttv/option.h \
+	$(top_includedir)/lttv/hook.h \
+	$(top_includedir)/lttv/attribute.h \
+	$(top_includedir)/lttv/iattribute.h \
+	$(top_includedir)/lttv/processTrace.h \
+	$(top_includedir)/lttv/state.h \
+	$(top_includedir)/lttv/traceset.h
 
 
 libdir = ${lttvplugindir}
@@ -30,3 +29,9 @@ libtextDump_la_LDFLAGS = -module
 libtextDump_la_SOURCES = textDump.c
 libbatchAnalysis_la_LDFLAGS = -module
 libbatchAnalysis_la_SOURCES = batchAnalysis.c
+
+
+# WARNING : must be done at the end, so modules can dynamically link themselves
+# to libraries compiled here but not installed in the system.
+SUBDIRS = modules
+