X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2FMakefile.am;h=f92fa54cc6ccd1532b5d19aba45afd2adb18ac97;hb=b9f1fde9d713ca417cdc67737c2ba75f6d86d0cd;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..f92fa54c 100644
--- a/ltt/branches/poly/lttv/Makefile.am
+++ b/ltt/branches/poly/lttv/Makefile.am
@@ -1,32 +1,14 @@
-SUBDIRS = modules
-
 AM_CFLAGS = $(GLIB_CFLAGS) 
-LIBS += $(GLIB_LIBS) -lgobject-2.0 -lltt
+LIBS += $(GLIB_LIBS) -lgobject-2.0 -L$(top_srcdir)/ltt -ltraceread
 
 bin_PROGRAMS = lttv
 
-#AM_CPPFLAGS = \
-#	-I$(top_srcdir)/include
-#INCLUDES=$(top_srcdir)/include
-
-lttv_SOURCES = main.c module.c option.c hook.c attribute.c \
-		iattribute.c processTrace.c state.c traceset.c
+lttv_SOURCES = main/main.c mainLib/module.c mainLib/option.c \
+               mainLib/hook.c mainLib/attribute.c \
+               mainLib/iattribute.c mainLib/processTrace.c \
+							 mainLib/state.c mainLib/stats.c mainLib/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
-
-
-libdir = ${lttvplugindir}
+# 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
 
-lib_LTLIBRARIES = libtextDump.la libbatchAnalysis.la
-libtextDump_la_LDFLAGS = -module
-libtextDump_la_SOURCES = textDump.c
-libbatchAnalysis_la_LDFLAGS = -module
-libbatchAnalysis_la_SOURCES = batchAnalysis.c