X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ustctl%2FMakefile.am;h=1e442a3fbc863dea4b6dd0271c9709eb541ebb46;hb=68d96813ccbb41602f92b45e8a5f61dea7525c35;hp=7ceca548aabcd73f2bf23c989638492b32778a77;hpb=55ad629d916dc8a9e0e8859bd469815dc9ec6ceb;p=ust.git

diff --git a/ustctl/Makefile.am b/ustctl/Makefile.am
index 7ceca54..1e442a3 100644
--- a/ustctl/Makefile.am
+++ b/ustctl/Makefile.am
@@ -1,8 +1,15 @@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/libustcomm \
+	-I$(top_srcdir)/libustctl $(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 $(top_builddir)/share/usterr.h
-ustctl_CFLAGS = -DUST_COMPONENT=ust
 
-INCLUDES = $(KCOMPAT_CFLAGS)
-INCLUDES += -I$(top_builddir)/libustcomm
-INCLUDES += -I$(top_builddir)/libustcmd
-INCLUDES += -I$(top_builddir)/share
+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)/libustctl/libustctl.la