X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ustctl%2FMakefile.am;h=3b09745ef2f9e682224791fe4cb429f55ec8556c;hb=0c89df6cb75f1d967003137e7fc334af1128a42f;hp=93c5629c98b5a7c501a0c4ec69fbfcf5f38c9e43;hpb=aa08b4413291fabcbd1b1144377d37034ad361de;p=ust.git

diff --git a/ustctl/Makefile.am b/ustctl/Makefile.am
index 93c5629..3b09745 100644
--- a/ustctl/Makefile.am
+++ b/ustctl/Makefile.am
@@ -1,7 +1,15 @@
-AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_builddir)/libustcomm \
-	-I$(top_builddir)/libustcmd $(KCOMPAT_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libustcomm \
+	-I$(top_srcdir)/libustcmd $(KCOMPAT_CFLAGS)
+AM_CFLAGS = -fno-strict-aliasing
 
 bin_PROGRAMS = ustctl
-ustctl_SOURCES = ustctl.c $(top_builddir)/libustcomm/ustcomm.c $(top_builddir)/libustcomm/ustcomm.h $(top_builddir)/libustcmd/ustcmd.c $(top_builddir)/libustcmd/ustcmd.h
-ustctl_CFLAGS = -DUST_COMPONENT=ustctl
 
+ustctl_SOURCES = \
+	ustctl.c marker_cmds.c trace_cmds.c channel_cmds.c cli.c cli.h scanning_functions.c scanning_functions.h
+
+ustctl_CFLAGS = -DUST_COMPONENT=ustctl -fno-strict-aliasing
+
+ustctl_LDADD = \
+	$(top_builddir)/snprintf/libustsnprintf.la \
+	$(top_builddir)/libustcomm/libustcomm.la \
+	$(top_builddir)/libustcmd/libustcmd.la