X-Git-Url: https://git.lttng.org/?p=lttngtop.git;a=blobdiff_plain;f=src%2FMakefile.am;h=86c8ccb400a1afbc34549ea6be3d3abf8c56602c;hp=bc1e258d73a9b3bca4b089f263b3e244b27b0863;hb=54645d5cab414bb3391837ef7acb919cf106c71f;hpb=e4404da406c52631a553466dc2d29dfe75beeef2

diff --git a/src/Makefile.am b/src/Makefile.am
index bc1e258..86c8ccb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,9 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/lib -DBABELTRACE_HAVE_LIBUUID
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/lib -DBABELTRACE_HAVE_LIBUUID -DBABELTRACE_HAVE_FMEMOPEN -DBABELTRACE_HAVE_OPEN_MEMSTREAM
 
 lib_LTLIBRARIES = libbabeltrace-lttngtop-live.la
 
 libbabeltrace_lttngtop_live_la_SOURCES = \
-				      network-live.c lttng-live-functions.c
+				      network-live.c lttng-live-comm.c
 
 bin_PROGRAMS = lttngtop
 
@@ -15,8 +15,46 @@ noinst_HEADERS = \
 	iostreamtop.h \
 	mmap-live.h \
 	network-live.h \
-	lttng-live-functions.h \
-	lttngtop.h
+	lttng-live-comm.h \
+	lttng-viewer-abi.h \
+	lttngtop.h \
+	lttng-session.h \
+	$(top_builddir)/lib/babeltrace/format.h \
+	$(top_builddir)/lib/babeltrace/compat/memstream.h \
+	$(top_builddir)/lib/babeltrace/compat/string.h \
+	$(top_builddir)/lib/babeltrace/compat/utc.h \
+	$(top_builddir)/lib/babeltrace/compat/uuid.h \
+	$(top_builddir)/lib/babeltrace/compiler.h \
+	$(top_builddir)/lib/babeltrace/types.h \
+	$(top_builddir)/lib/babeltrace/context-internal.h \
+	$(top_builddir)/lib/babeltrace/format-internal.h \
+	$(top_builddir)/lib/babeltrace/babeltrace.h \
+	$(top_builddir)/lib/babeltrace/trace-collection.h \
+	$(top_builddir)/lib/babeltrace/clock-internal.h \
+	$(top_builddir)/lib/babeltrace/mmap-align.h \
+	$(top_builddir)/lib/babeltrace/list.h \
+	$(top_builddir)/lib/babeltrace/iterator.h \
+	$(top_builddir)/lib/babeltrace/ctf-ir/metadata.h \
+	$(top_builddir)/lib/babeltrace/ctf-text/types.h \
+	$(top_builddir)/lib/babeltrace/context.h \
+	$(top_builddir)/lib/babeltrace/iterator-internal.h \
+	$(top_builddir)/lib/babeltrace/bitfield.h \
+	$(top_builddir)/lib/babeltrace/trace-handle.h \
+	$(top_builddir)/lib/babeltrace/trace-handle-internal.h \
+	$(top_builddir)/lib/babeltrace/babeltrace-internal.h \
+	$(top_builddir)/lib/babeltrace/align.h \
+	$(top_builddir)/lib/babeltrace/ctf/types.h \
+	$(top_builddir)/lib/babeltrace/ctf/callbacks-internal.h \
+	$(top_builddir)/lib/babeltrace/ctf/ctf-index.h \
+	$(top_builddir)/lib/babeltrace/ctf/iterator.h \
+	$(top_builddir)/lib/babeltrace/ctf/events-internal.h \
+	$(top_builddir)/lib/babeltrace/ctf/callbacks.h \
+	$(top_builddir)/lib/babeltrace/ctf/metadata.h \
+	$(top_builddir)/lib/babeltrace/ctf/events.h \
+	$(top_builddir)/lib/babeltrace/clock-types.h \
+	$(top_builddir)/lib/babeltrace/prio_heap.h \
+	$(top_builddir)/lib/babeltrace/endian.h
+
 
 lttngtop_SOURCES = \
 	lttngtop.c \
@@ -24,11 +62,10 @@ lttngtop_SOURCES = \
 	cursesdisplay.c \
 	cputop.c \
 	iostreamtop.c \
-	mmap-live.c
+	mmap-live.c \
+	lttng-session.c
 
 lttngtop_LDFLAGS = -Wl,--no-as-needed
 
-#lttngtop_LDADD = -lbabeltrace -lbabeltrace-ctf -llttngtop-helper -llttng-ctl -lurcu -llttngtopmmappacketseek -llttng-ust-ctl -lcurses -lpanel
-lttngtop_LDADD = -lbabeltrace -lbabeltrace-ctf -llttng-ctl -lurcu -llttng-ust-ctl -lcurses -lpanel \
-		 $(top_builddir)/src/libbabeltrace-lttngtop-live.la
-
+lttngtop_LDADD = -lbabeltrace -lbabeltrace-ctf -llttng-ctl \
+		 -lurcu -llttng-ust-ctl $(lib_LTLIBRARIES)