X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2FMakefile.am;h=c75601f21ad3b1602606635e52e9d3c09103b98f;hp=21eebab7d6b3a797e6805203bf9131b25ec90d63;hb=2d97a0067600335f07eecb2c1d9ba68fc164583e;hpb=74130cb7d45f2c698c1a9f224bf8e7a2f2368f18

diff --git a/src/bin/lttng/Makefile.am b/src/bin/lttng/Makefile.am
index 21eebab7d..c75601f21 100644
--- a/src/bin/lttng/Makefile.am
+++ b/src/bin/lttng/Makefile.am
@@ -1,5 +1,10 @@
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/src \
-			  -DINSTALL_BIN_PATH=\""$(bindir)"\"
+AM_CPPFLAGS += -DINSTALL_BIN_PATH=\""$(bindir)"\"
+
+if EMBED_HELP
+AM_CPPFLAGS += -I$(top_builddir)/doc/man
+endif
+
+AUTOMAKE_OPTIONS = subdir-objects
 
 bin_PROGRAMS = lttng
 
@@ -9,9 +14,25 @@ lttng_SOURCES = command.h conf.c conf.h commands/start.c \
 				commands/disable_events.c commands/enable_channels.c \
 				commands/disable_channels.c commands/add_context.c \
 				commands/set_session.c commands/version.c \
-				commands/calibrate.c commands/view.c \
-				commands/enable_consumer.c commands/disable_consumer.c \
+				commands/view.c \
+				commands/snapshot.c \
+				commands/save.c \
+				commands/load.c \
+				commands/track-untrack.c \
+				commands/status.c \
+				commands/metadata.c \
+				commands/regenerate.c \
+				commands/help.c \
+				commands/rotate.c \
+				commands/enable_rotation.c \
+				commands/disable_rotation.c \
+				commands/clear.c \
 				utils.c utils.h lttng.c
 
+lttng_CFLAGS = $(AM_CFLAGS) $(POPT_CFLAGS)
+
 lttng_LDADD = $(top_builddir)/src/lib/lttng-ctl/liblttng-ctl.la \
-			  $(top_builddir)/src/common/libcommon.la
+			$(top_builddir)/src/common/libcommon.la \
+			$(top_builddir)/src/common/config/libconfig.la \
+			$(top_builddir)/src/common/string-utils/libstring-utils.la \
+			$(POPT_LIBS)